Skip to content

Commit

Permalink
update release to 3.5
Browse files Browse the repository at this point in the history
Signed-off-by: CHUAN HUANG <[email protected]>
  • Loading branch information
huang-cn committed Sep 20, 2022
1 parent 855d0a1 commit aa714a0
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Charts
on:
push:
branches:
- release-3.4
- release-3.5
paths:
- 'config/cp4waiops/**'
- 'config/cp-shared/**'
Expand All @@ -24,15 +24,15 @@ jobs:
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
- name: Run AI Manager chart-releaser for CP4WAIOps 3.4
- name: Run AI Manager chart-releaser for CP4WAIOps 3.5
uses: helm/[email protected]
with:
version: v1.3.0
charts_dir: 'config/cp4waiops'
env:
CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

- name: Run Shared Components chart-releaser for CP4WAIOps 3.4
- name: Run Shared Components chart-releaser for CP4WAIOps 3.5
uses: helm/[email protected]
with:
version: v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions config/all-in-one/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0
version: 3.5.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: "1.0"
appVersion: "3.5"
4 changes: 3 additions & 1 deletion config/all-in-one/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ Specify the config path for cp4waiops aimanager
{{- printf "config/cp4waiops/install-aimgr" -}}
{{- else if eq .Values.cp4waiops.version "v3.4" }}
{{- printf "config/cp4waiops/install-aimgr" -}}
{{- else if eq .Values.cp4waiops.version "v3.5" }}
{{- printf "config/cp4waiops/install-aimgr" -}}
{{- else }}
{{- fail "The CP4WAIOps all in one chart only supports release v3.2, v3.3, v3.4." }}
{{- fail "The CP4WAIOps all in one chart only supports release v3.2, v3.3, v3.4, v3.5." }}
{{- end }}
{{- end -}}

Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/aimanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
source:
path: {{ template "cp4waiops.aimanager.configPath" . }}
repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }}
targetRevision: {{ default "release-3.4" .Values.cp4waiops.targetRevision }}
targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }}
helm:
parameters:
- name: spec.aiManager.instanceName
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
source:
path: config/argocd/{{ .Values.argocd.cluster }}
repoURL: https://github.com/IBM/cp4waiops-gitops
targetRevision: release-3.4
targetRevision: release-3.5
syncPolicy:
automated:
prune: true
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/clusters-fyre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
source:
path: config/clusters/fyre
repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }}
targetRevision: {{ default "release-3.4" .Values.cp4waiops.targetRevision }}
targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }}
helm:
parameters:
- name: provider.fyre.credentials.user
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/cp-shared.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
source:
path: config/cp-shared/operators
repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }}
targetRevision: {{ default "release-3.4" .Values.cp4waiops.targetRevision }}
targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }}
helm:
parameters:
{{- if .Values.cp4waiops.imageCatalog }}
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/cp4waiops-custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
source:
path: config/cp4waiops-custom
repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }}
targetRevision: {{ default "release-3.4" .Values.cp4waiops.targetRevision }}
targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }}
helm:
valueFiles:
- values.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/templates/rook-ceph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
source:
path: config/ceph
repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }}
targetRevision: {{ default "release-3.4" .Values.cp4waiops.targetRevision }}
targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }}
syncPolicy:
automated:
prune: true
Expand Down
2 changes: 1 addition & 1 deletion config/all-in-one/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ rookceph:
cp4waiops:

# Specify the version of CP4WAIOps, e.g.: v3.2, v3.3.
version: v3.3
version: v3.5

# The username of image registry used to pull CP4WAIOps images.
#dockerUsername: cp
Expand Down
4 changes: 2 additions & 2 deletions config/clusters/fyre/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1
version: 3.5.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: "0.0.1"
appVersion: "3.5"
4 changes: 2 additions & 2 deletions config/cp-shared/operators/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.2
version: 3.5.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: "1.0"
appVersion: "3.5"

4 changes: 2 additions & 2 deletions config/cp4waiops/install-aimgr/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.4.0
version: 3.5.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: "3.4"
appVersion: "3.5"

2 changes: 1 addition & 1 deletion config/cp4waiops/install-aimgr/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
## A channel defines a stream of updates for an Operator and is used to roll out updates for subscribers.
## For example, if you want to install AI Manager 3.2, the channel should be v3.2
##
channel: v3.4
channel: v3.5

## size is the size that you require for your AI Manager installation. It can be small or large.
## More information: https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/3.2.0?topic=requirements-ai-manager
Expand Down

0 comments on commit aa714a0

Please sign in to comment.