IBM · lihongbj · Dec 15, 2022 · Jan 12, 2023 · Mar 18, 2023 · Mar 31, 2023
diff --git 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
 

diff --git 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.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.5"
+appVersion: "3.7"
diff --git 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.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
@@ -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.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
@@ -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.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
@@ -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.5" .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
diff --git 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.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
@@ -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.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
@@ -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.7" .Values.cp4waiops.targetRevision }}
       syncPolicy:
         automated:
           prune: true

diff --git 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.7
 
   # The username of image registry used to pull CP4WAIOps images.
   #dockerUsername: cp

diff --git 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
+        # disabled: false
diff --git 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
@@ -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
@@ -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
diff --git 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.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.5"
+appVersion: "3.7"
 
diff --git 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
@@ -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 }}
+{{- end }}
diff --git 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 }}
+{{- end }}
diff --git 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.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.5"
+appVersion: "3.7"
 
diff --git 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.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
@@ -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.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.5"
+appVersion: "3.7"
 
diff --git 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

diff --git 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)
     ##