From 9231fa74443e767403de28371a89277a0ac9a00f Mon Sep 17 00:00:00 2001 From: huang-cn <58250676+huang-cn@users.noreply.github.com> Date: Thu, 15 Dec 2022 23:45:32 +0800 Subject: [PATCH 1/9] update version to 3.6 (#233) Signed-off-by: CHUAN HUANG Signed-off-by: CHUAN HUANG Signed-off-by: lihongbj --- config/cp4waiops/install-aimgr/Chart.yaml | 4 ++-- config/cp4waiops/install-aimgr/values.yaml | 2 +- config/cp4waiops/install-emgr/Chart.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/cp4waiops/install-aimgr/Chart.yaml b/config/cp4waiops/install-aimgr/Chart.yaml index c1a5b2cd..be59779b 100644 --- a/config/cp4waiops/install-aimgr/Chart.yaml +++ b/config/cp4waiops/install-aimgr/Chart.yaml @@ -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.5.0 +version: 3.6.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.5" +appVersion: "3.6" diff --git a/config/cp4waiops/install-aimgr/values.yaml b/config/cp4waiops/install-aimgr/values.yaml index abc32bf1..53ef9405 100644 --- a/config/cp4waiops/install-aimgr/values.yaml +++ b/config/cp4waiops/install-aimgr/values.yaml @@ -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.5 + channel: v3.6 ## 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 diff --git a/config/cp4waiops/install-emgr/Chart.yaml b/config/cp4waiops/install-emgr/Chart.yaml index 71f61fcc..f95c37ab 100644 --- a/config/cp4waiops/install-emgr/Chart.yaml +++ b/config/cp4waiops/install-emgr/Chart.yaml @@ -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.5.0 +version: 3.6.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.5" +appVersion: "3.6" From 1079e018d113fbf2d05274174e6c35e2de332d77 Mon Sep 17 00:00:00 2001 From: huang-cn <58250676+huang-cn@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:37:17 +0800 Subject: [PATCH 2/9] update version numbers (#239) Signed-off-by: Huang Chuan Signed-off-by: Huang Chuan Signed-off-by: lihongbj --- config/all-in-one/Chart.yaml | 4 ++-- config/all-in-one/templates/aimanager.yaml | 2 +- config/all-in-one/templates/argocd.yaml | 2 +- config/all-in-one/templates/clusters-fyre.yaml | 2 +- config/all-in-one/templates/cp-shared.yaml | 2 +- config/all-in-one/templates/cp4waiops-custom.yaml | 2 +- config/all-in-one/templates/eventmanager.yaml | 2 +- config/all-in-one/templates/rook-ceph.yaml | 2 +- config/all-in-one/values.yaml | 2 +- config/cp-shared/operators/Chart.yaml | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/all-in-one/Chart.yaml b/config/all-in-one/Chart.yaml index 16e48900..7ddbf191 100644 --- a/config/all-in-one/Chart.yaml +++ b/config/all-in-one/Chart.yaml @@ -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: 3.5.0 +version: 3.6.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.5" +appVersion: "3.6" diff --git a/config/all-in-one/templates/aimanager.yaml b/config/all-in-one/templates/aimanager.yaml index 5b7fc4c5..8560c82b 100644 --- a/config/all-in-one/templates/aimanager.yaml +++ b/config/all-in-one/templates/aimanager.yaml @@ -26,7 +26,7 @@ spec: source: path: "config/cp4waiops/install-aimgr" repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} helm: parameters: - name: spec.aiManager.instanceName diff --git a/config/all-in-one/templates/argocd.yaml b/config/all-in-one/templates/argocd.yaml index a56691d3..dcac9234 100644 --- a/config/all-in-one/templates/argocd.yaml +++ b/config/all-in-one/templates/argocd.yaml @@ -18,7 +18,7 @@ spec: source: path: config/argocd/{{ .Values.argocd.cluster }} repoURL: https://github.com/IBM/cp4waiops-gitops - targetRevision: release-3.5 + targetRevision: release-3.6 syncPolicy: automated: prune: true diff --git a/config/all-in-one/templates/clusters-fyre.yaml b/config/all-in-one/templates/clusters-fyre.yaml index adeb2200..f6ef74bb 100644 --- a/config/all-in-one/templates/clusters-fyre.yaml +++ b/config/all-in-one/templates/clusters-fyre.yaml @@ -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.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} helm: parameters: - name: provider.fyre.credentials.user diff --git a/config/all-in-one/templates/cp-shared.yaml b/config/all-in-one/templates/cp-shared.yaml index c2efae4b..00e78e3f 100644 --- a/config/all-in-one/templates/cp-shared.yaml +++ b/config/all-in-one/templates/cp-shared.yaml @@ -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.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} helm: parameters: {{- if .Values.cp4waiops.imageCatalog }} diff --git a/config/all-in-one/templates/cp4waiops-custom.yaml b/config/all-in-one/templates/cp4waiops-custom.yaml index 8307ddb0..ba8b972d 100644 --- a/config/all-in-one/templates/cp4waiops-custom.yaml +++ b/config/all-in-one/templates/cp4waiops-custom.yaml @@ -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.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} helm: valueFiles: - values.yaml diff --git a/config/all-in-one/templates/eventmanager.yaml b/config/all-in-one/templates/eventmanager.yaml index 2b287ea0..c0ece010 100644 --- a/config/all-in-one/templates/eventmanager.yaml +++ b/config/all-in-one/templates/eventmanager.yaml @@ -26,7 +26,7 @@ spec: source: path: "config/cp4waiops/install-emgr" repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} helm: parameters: - name: spec.eventManager.namespace diff --git a/config/all-in-one/templates/rook-ceph.yaml b/config/all-in-one/templates/rook-ceph.yaml index 1d7eb14f..0581a285 100644 --- a/config/all-in-one/templates/rook-ceph.yaml +++ b/config/all-in-one/templates/rook-ceph.yaml @@ -26,7 +26,7 @@ spec: source: path: config/ceph repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.5" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} syncPolicy: automated: prune: true diff --git a/config/all-in-one/values.yaml b/config/all-in-one/values.yaml index 56780f34..fb23405d 100644 --- a/config/all-in-one/values.yaml +++ b/config/all-in-one/values.yaml @@ -60,7 +60,7 @@ rookceph: cp4waiops: # Specify the version of CP4WAIOps, e.g.: v3.2, v3.3. - version: v3.5 + version: v3.6 # The username of image registry used to pull CP4WAIOps images. #dockerUsername: cp diff --git a/config/cp-shared/operators/Chart.yaml b/config/cp-shared/operators/Chart.yaml index 804ace73..993012b4 100644 --- a/config/cp-shared/operators/Chart.yaml +++ b/config/cp-shared/operators/Chart.yaml @@ -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.5.0 +version: 3.6.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.5" +appVersion: "3.6" From 8dd09beeb17ed50633b79365731ce8edbde8c1e6 Mon Sep 17 00:00:00 2001 From: lihongbj Date: Sat, 18 Mar 2023 16:31:07 +0800 Subject: [PATCH 3/9] fix custom ns missing in cm/aiops-custom-size-profile Signed-off-by: lihongbj --- config/cp4waiops-custom/templates/custom-size.yaml | 1 + config/cp4waiops-custom/templates/x-small-idle.yaml | 3 ++- config/cp4waiops-custom/templates/x-small.yaml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/cp4waiops-custom/templates/custom-size.yaml b/config/cp4waiops-custom/templates/custom-size.yaml index 843e080b..2525fa29 100644 --- a/config/cp4waiops-custom/templates/custom-size.yaml +++ b/config/cp4waiops-custom/templates/custom-size.yaml @@ -5,6 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "-1" name: aiops-custom-size-profile + namespace: {{ .Values.aiManager.namespace }} data: profiles: | generatedFor: "NonHA" diff --git a/config/cp4waiops-custom/templates/x-small-idle.yaml b/config/cp4waiops-custom/templates/x-small-idle.yaml index 4e106281..92c39e9b 100644 --- a/config/cp4waiops-custom/templates/x-small-idle.yaml +++ b/config/cp4waiops-custom/templates/x-small-idle.yaml @@ -5,6 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "-1" name: aiops-custom-size-profile + namespace: {{ .Values.aiManager.namespace }} data: profiles: | generatedFor: "NonHA" @@ -592,4 +593,4 @@ spec: serviceAccountRef: name: resource-locker-operator-controller-manager -{{- end }} \ No newline at end of file +{{- end }} diff --git a/config/cp4waiops-custom/templates/x-small.yaml b/config/cp4waiops-custom/templates/x-small.yaml index 0609a128..c5b36010 100644 --- a/config/cp4waiops-custom/templates/x-small.yaml +++ b/config/cp4waiops-custom/templates/x-small.yaml @@ -5,6 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "-1" name: aiops-custom-size-profile + namespace: {{ .Values.aiManager.namespace }} data: profiles: | generatedFor: "NonHA" @@ -506,4 +507,4 @@ spec: namespace: {{.Values.aiManager.namespace}} serviceAccountRef: name: resource-locker-operator-controller-manager -{{- end }} \ No newline at end of file +{{- end }} From 78f5d827ca9a53c6f3d95875fe9d359d46035fea Mon Sep 17 00:00:00 2001 From: lihongbj Date: Fri, 31 Mar 2023 15:30:41 +0800 Subject: [PATCH 4/9] upgrade to release-3.7 Signed-off-by: lihongbj --- config/all-in-one/Chart.yaml | 4 ++-- config/all-in-one/templates/aimanager.yaml | 2 +- config/all-in-one/templates/argocd.yaml | 2 +- config/all-in-one/templates/clusters-fyre.yaml | 2 +- config/all-in-one/templates/cp-shared.yaml | 2 +- config/all-in-one/templates/cp4waiops-custom.yaml | 2 +- config/all-in-one/templates/eventmanager.yaml | 2 +- config/all-in-one/templates/rook-ceph.yaml | 2 +- config/all-in-one/values.yaml | 2 +- config/cp-shared/operators/Chart.yaml | 4 ++-- config/cp4waiops/install-aimgr/Chart.yaml | 4 ++-- config/cp4waiops/install-aimgr/values.yaml | 2 +- config/cp4waiops/install-emgr/Chart.yaml | 4 ++-- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/all-in-one/Chart.yaml b/config/all-in-one/Chart.yaml index 7ddbf191..5f0e459e 100644 --- a/config/all-in-one/Chart.yaml +++ b/config/all-in-one/Chart.yaml @@ -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: 3.6.0 +version: 3.7.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.6" +appVersion: "3.7" diff --git a/config/all-in-one/templates/aimanager.yaml b/config/all-in-one/templates/aimanager.yaml index 8560c82b..2395b1b7 100644 --- a/config/all-in-one/templates/aimanager.yaml +++ b/config/all-in-one/templates/aimanager.yaml @@ -26,7 +26,7 @@ spec: source: path: "config/cp4waiops/install-aimgr" repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} helm: parameters: - name: spec.aiManager.instanceName diff --git a/config/all-in-one/templates/argocd.yaml b/config/all-in-one/templates/argocd.yaml index dcac9234..687a9daf 100644 --- a/config/all-in-one/templates/argocd.yaml +++ b/config/all-in-one/templates/argocd.yaml @@ -18,7 +18,7 @@ spec: source: path: config/argocd/{{ .Values.argocd.cluster }} repoURL: https://github.com/IBM/cp4waiops-gitops - targetRevision: release-3.6 + targetRevision: release-3.7 syncPolicy: automated: prune: true diff --git a/config/all-in-one/templates/clusters-fyre.yaml b/config/all-in-one/templates/clusters-fyre.yaml index f6ef74bb..0d826f3d 100644 --- a/config/all-in-one/templates/clusters-fyre.yaml +++ b/config/all-in-one/templates/clusters-fyre.yaml @@ -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.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} helm: parameters: - name: provider.fyre.credentials.user diff --git a/config/all-in-one/templates/cp-shared.yaml b/config/all-in-one/templates/cp-shared.yaml index 00e78e3f..56747df3 100644 --- a/config/all-in-one/templates/cp-shared.yaml +++ b/config/all-in-one/templates/cp-shared.yaml @@ -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.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} helm: parameters: {{- if .Values.cp4waiops.imageCatalog }} diff --git a/config/all-in-one/templates/cp4waiops-custom.yaml b/config/all-in-one/templates/cp4waiops-custom.yaml index ba8b972d..7adb0070 100644 --- a/config/all-in-one/templates/cp4waiops-custom.yaml +++ b/config/all-in-one/templates/cp4waiops-custom.yaml @@ -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.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} helm: valueFiles: - values.yaml diff --git a/config/all-in-one/templates/eventmanager.yaml b/config/all-in-one/templates/eventmanager.yaml index c0ece010..b8567cbb 100644 --- a/config/all-in-one/templates/eventmanager.yaml +++ b/config/all-in-one/templates/eventmanager.yaml @@ -26,7 +26,7 @@ spec: source: path: "config/cp4waiops/install-emgr" repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} helm: parameters: - name: spec.eventManager.namespace diff --git a/config/all-in-one/templates/rook-ceph.yaml b/config/all-in-one/templates/rook-ceph.yaml index 0581a285..18da7967 100644 --- a/config/all-in-one/templates/rook-ceph.yaml +++ b/config/all-in-one/templates/rook-ceph.yaml @@ -26,7 +26,7 @@ spec: source: path: config/ceph repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.6" .Values.cp4waiops.targetRevision }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} syncPolicy: automated: prune: true diff --git a/config/all-in-one/values.yaml b/config/all-in-one/values.yaml index fb23405d..f8f8b0ba 100644 --- a/config/all-in-one/values.yaml +++ b/config/all-in-one/values.yaml @@ -60,7 +60,7 @@ rookceph: cp4waiops: # Specify the version of CP4WAIOps, e.g.: v3.2, v3.3. - version: v3.6 + version: v3.7 # The username of image registry used to pull CP4WAIOps images. #dockerUsername: cp diff --git a/config/cp-shared/operators/Chart.yaml b/config/cp-shared/operators/Chart.yaml index 993012b4..030a945b 100644 --- a/config/cp-shared/operators/Chart.yaml +++ b/config/cp-shared/operators/Chart.yaml @@ -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.6.0 +version: 3.7.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.6" +appVersion: "3.7" diff --git a/config/cp4waiops/install-aimgr/Chart.yaml b/config/cp4waiops/install-aimgr/Chart.yaml index be59779b..8e1c575c 100644 --- a/config/cp4waiops/install-aimgr/Chart.yaml +++ b/config/cp4waiops/install-aimgr/Chart.yaml @@ -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.6.0 +version: 3.7.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.6" +appVersion: "3.7" diff --git a/config/cp4waiops/install-aimgr/values.yaml b/config/cp4waiops/install-aimgr/values.yaml index 53ef9405..dba9e112 100644 --- a/config/cp4waiops/install-aimgr/values.yaml +++ b/config/cp4waiops/install-aimgr/values.yaml @@ -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.6 + channel: v3.7 ## 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 diff --git a/config/cp4waiops/install-emgr/Chart.yaml b/config/cp4waiops/install-emgr/Chart.yaml index f95c37ab..418900ce 100644 --- a/config/cp4waiops/install-emgr/Chart.yaml +++ b/config/cp4waiops/install-emgr/Chart.yaml @@ -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.6.0 +version: 3.7.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.6" +appVersion: "3.7" From ec4c17f760426267c3967bbb4552df34ec21caf9 Mon Sep 17 00:00:00 2001 From: lihongbj <76047489+lihongbj@users.noreply.github.com> Date: Tue, 4 Apr 2023 16:24:55 +0800 Subject: [PATCH 5/9] fix wording Signed-off-by: lihongbj --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de3d9645..8df8a4c0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ # Deploy Cloud Pak for Watson AIOps using GitOps -This repository is about using OpenShift GitOps to deployCloud Pak for Watson AIOps(CP4WAIOps) on Red Hat OpenShift Cluster. Refer to our [gitops webpage](https://ibm.github.io/cp4waiops-gitops/docs/) to check detailed document and start your toturial with gitops. +This repository is about using OpenShift GitOps to deploy Cloud Pak for Watson AIOps(CP4WAIOps) on Red Hat OpenShift Cluster. Refer to our [gitops webpage](https://ibm.github.io/cp4waiops-gitops/docs/) to check detailed document and start your toturial with gitops. ## Install CP4WAIOps using GitOps From 6682f6f27d640c402ab5e2d970c41c72122d297c Mon Sep 17 00:00:00 2001 From: HONG LI Date: Tue, 4 Apr 2023 17:41:31 +0800 Subject: [PATCH 6/9] add support ceph on sno Signed-off-by: HONG LI Signed-off-by: lihongbj --- config/ceph/templates/cluster.yaml | 6 +++--- config/ceph/templates/filesystem.yaml | 8 ++++---- config/ceph/values-sno.yaml | 17 +++++++++++++++++ config/ceph/values.yaml | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 config/ceph/values-sno.yaml diff --git a/config/ceph/templates/cluster.yaml b/config/ceph/templates/cluster.yaml index aad7d142..568551e5 100644 --- a/config/ceph/templates/cluster.yaml +++ b/config/ceph/templates/cluster.yaml @@ -45,10 +45,10 @@ spec: waitTimeoutForHealthyOSDInMinutes: 10 mon: # Set the number of mons to be started. Must be an odd number, and is generally recommended to be 3. - count: 3 + count: {{ .Values.cephCluster.mon.count }} # The mons should be on unique nodes. For production, at least 3 nodes are recommended for this reason. # Mons should only be allowed on the same node for test environments where data loss is acceptable. - # allowMultiplePerNode: false + allowMultiplePerNode: {{ .Values.cephCluster.mon.allowMultiplePerNode }} mgr: modules: # Several modules should not need to be included in this list. The "dashboard" and "monitoring" modules @@ -252,4 +252,4 @@ spec: mgr: {} # disabled: false osd: {} - # disabled: false \ No newline at end of file + # disabled: false diff --git a/config/ceph/templates/filesystem.yaml b/config/ceph/templates/filesystem.yaml index dd2da681..09c40cb9 100644 --- a/config/ceph/templates/filesystem.yaml +++ b/config/ceph/templates/filesystem.yaml @@ -13,8 +13,8 @@ spec: # The metadata pool spec. Must use replication. metadataPool: replicated: - size: 3 - requireSafeReplicaSize: true + size: {{ .Values.cephFilesystem.metadataPool.replicated.size }} + requireSafeReplicaSize: {{ .Values.cephFilesystem.metadataPool.replicated.requireSafeReplicaSize }} parameters: # Inline compression mode for the data pool # Further reference: https://docs.ceph.com/docs/nautilus/rados/configuration/bluestore-config-ref/#inline-compression @@ -26,10 +26,10 @@ spec: dataPools: - failureDomain: host replicated: - size: 3 + size: {{ .Values.cephFilesystem.dataPools.replicated.size }} # Disallow setting pool with replica 1, this could lead to data loss without recovery. # Make sure you're *ABSOLUTELY CERTAIN* that is what you want - requireSafeReplicaSize: true + requireSafeReplicaSize: {{ .Values.cephFilesystem.dataPools.replicated.requireSafeReplicaSize }} parameters: # Inline compression mode for the data pool # Further reference: https://docs.ceph.com/docs/nautilus/rados/configuration/bluestore-config-ref/#inline-compression diff --git a/config/ceph/values-sno.yaml b/config/ceph/values-sno.yaml new file mode 100644 index 00000000..9c1c56c0 --- /dev/null +++ b/config/ceph/values-sno.yaml @@ -0,0 +1,17 @@ +# ----------------------------------------------------------------------------- +# Ceph rook parameters +# ----------------------------------------------------------------------------- +cephCluster: + mon: + count: 1 + allowMultiplePerNode: true + +cephFilesystem: + metadataPool: + replicated: + size: 1 + requireSafeReplicaSize: false + dataPools: + replicated: + size: 1 + requireSafeReplicaSize: false diff --git a/config/ceph/values.yaml b/config/ceph/values.yaml index 8304c2e6..a30d25f5 100644 --- a/config/ceph/values.yaml +++ b/config/ceph/values.yaml @@ -1,3 +1,17 @@ # ----------------------------------------------------------------------------- # Ceph rook parameters # ----------------------------------------------------------------------------- +cephCluster: + mon: + count: 3 + allowMultiplePerNode: false + +cephFilesystem: + metadataPool: + replicated: + size: 3 + requireSafeReplicaSize: true + dataPools: + replicated: + size: 3 + requireSafeReplicaSize: true From f2bab2280c997967e6f287364edd2a7406997ed3 Mon Sep 17 00:00:00 2001 From: lihongbj Date: Thu, 6 Apr 2023 19:22:49 +0800 Subject: [PATCH 7/9] try to update/fix without zen in new noi Signed-off-by: lihongbj --- .../install-emgr/templates/resources/070-noi-eventmanager.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/cp4waiops/install-emgr/templates/resources/070-noi-eventmanager.yaml b/config/cp4waiops/install-emgr/templates/resources/070-noi-eventmanager.yaml index fa1b8d98..1c9dff2c 100644 --- a/config/cp4waiops/install-emgr/templates/resources/070-noi-eventmanager.yaml +++ b/config/cp4waiops/install-emgr/templates/resources/070-noi-eventmanager.yaml @@ -13,9 +13,6 @@ spec: antiAffinity: false imagePullPolicy: IfNotPresent imagePullRepository: cp.icr.io/cp/noi - zen: - serviceInstanceName: iaf-zen-cpdservice - serviceNamespace: '' serviceContinuity: continuousAnalyticsCorrelation: false isBackupDeployment: false From dc852be85eb9dc8e4e93826893bc66aaa06714b6 Mon Sep 17 00:00:00 2001 From: lihongbj Date: Thu, 6 Apr 2023 20:50:12 +0800 Subject: [PATCH 8/9] upgrade noi version, channel Signed-off-by: lihongbj --- config/cp4waiops/install-emgr/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cp4waiops/install-emgr/values.yaml b/config/cp4waiops/install-emgr/values.yaml index 85f3854b..7ef320a8 100644 --- a/config/cp4waiops/install-emgr/values.yaml +++ b/config/cp4waiops/install-emgr/values.yaml @@ -35,7 +35,7 @@ spec: eventManager: # eventManager version - version: 1.6.6 + version: 1.6.8 ## Use the fully qualified domain name (FQDN) to formulate the clusterDomain property, using the following formula: ## @@ -44,7 +44,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 Evemt Manager 1.5, the channel should be v1.5 ## - channel: v1.10 + channel: v1.12 ## Deployment type (trial or production) ## From 365227cb457864a35525e0848498a3a586047804 Mon Sep 17 00:00:00 2001 From: HONG LI Date: Mon, 24 Apr 2023 09:49:44 +0800 Subject: [PATCH 9/9] update cp-share as appset sync main Signed-off-by: HONG LI --- config/all-in-one/templates/cp-shared.yaml | 55 +++++++++++++--------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/config/all-in-one/templates/cp-shared.yaml b/config/all-in-one/templates/cp-shared.yaml index 56747df3..3bd9db70 100644 --- a/config/all-in-one/templates/cp-shared.yaml +++ b/config/all-in-one/templates/cp-shared.yaml @@ -1,25 +1,38 @@ apiVersion: argoproj.io/v1alpha1 -kind: Application +kind: ApplicationSet metadata: name: cp-shared - annotations: - argocd.argoproj.io/sync-wave: "110" spec: - destination: - namespace: openshift-marketplace - server: 'https://kubernetes.default.svc' - project: default - source: - path: config/cp-shared/operators - repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} - targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} - helm: - parameters: - {{- if .Values.cp4waiops.imageCatalog }} - - name: spec.imageCatalog - value: '{{ .Values.cp4waiops.imageCatalog }}' - {{- end }} - syncPolicy: - automated: - prune: true - selfHeal: true + generators: + {{- if .Values.argocd.allowLocalDeploy }} + - clusters: {} + {{- else }} + - clusters: + selector: + matchLabels: + argocd.argoproj.io/secret-type: cluster + {{- end }} + template: + metadata: + name: '{{ `{{name}}-cp-shared` }}' + annotations: + argocd.argoproj.io/sync-wave: "110" + spec: + destination: + namespace: openshift-marketplace + server: 'https://kubernetes.default.svc' + project: default + source: + path: config/cp-shared/operators + repoURL: {{ default "https://github.com/IBM/cp4waiops-gitops" .Values.cp4waiops.repoURL }} + targetRevision: {{ default "release-3.7" .Values.cp4waiops.targetRevision }} + helm: + parameters: + {{- if .Values.cp4waiops.imageCatalog }} + - name: spec.imageCatalog + value: '{{ .Values.cp4waiops.imageCatalog }}' + {{- end }} + syncPolicy: + automated: + prune: true + selfHeal: true