feat: Upgrade Cloud Pak for WAIOps to 4.2.0

Signed-off-by: Denilson Nastacio <[email protected]>

README.md

@@ -39,7 +39,9 @@ Supported versions:
 | Cloud Pak for Data | [4.7.2](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=overview) | Online, specialized installation |
 | Cloud Pak for Integration | [2023.2](https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.2) | Online installation |
 | Cloud Pak for Security | [1.10.15](https://www.ibm.com/docs/en/cloud-paks/cp-security/1.10) | Online installation |
-| Cloud Pak for Watson AIOps | [4.1.2](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.1.2) | Starter Installation |
+| Cloud Pak for AIOps\* | [4.2.0](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.2.0) | Starter Installation |
+
+\* Starting with release 4.2.0, Cloud Pak for Watson AIOps was renamed Cloud Pak for AIOps.
 
 ### Shared cluster
 

config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml

@@ -136,7 +136,7 @@ spec:
                 exit
               fi
 
-              for cloudpak in cp4d cp4i cp4waiops
+              for cloudpak in cp4d cp4i cp4aiops cp4waiops
               do
                   echo "INFO: Creating or patching the RHACM configmap"
                   config_map_name=argocd-${cloudpak}-config

config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml

@@ -48,9 +48,9 @@ spec:
                   - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4s}}-cs
                     requested-from-namespace:
                     - {{.Values.dedicated_cs.namespace_mapping.cp4s}}
-                  - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4waiops}}
+                  - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4aiops}}
                     requested-from-namespace:
-                    - {{.Values.dedicated_cs.namespace_mapping.cp4waiops}}
+                    - {{.Values.dedicated_cs.namespace_mapping.cp4aiops}}
               EOF
               else
                 echo "INFO: ConfigMap common-service-maps already exists."

config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml

@@ -39,8 +39,8 @@ spec:
           value: "{{.Values.dedicated_cs.namespace_mapping.cp4i}}"
         - name: dedicated_cs.namespace_mapping.cp4s
           value: "{{.Values.dedicated_cs.namespace_mapping.cp4s}}"
-        - name: dedicated_cs.namespace_mapping.cp4waiops
-          value: "{{.Values.dedicated_cs.namespace_mapping.cp4waiops}}"
+        - name: dedicated_cs.namespace_mapping.cp4aiops
+          value: "{{.Values.dedicated_cs.namespace_mapping.cp4aiops}}"
         - name: online_catalog_source_priority
           value: "{{.Values.online_catalog_source_priority}}"
         - name: storageclass.rwo.override

config/argocd-cloudpaks/cp-shared/values.yaml

@@ -15,7 +15,7 @@ dedicated_cs:
     cp4d: cp4d
     cp4i: cp4i
     cp4s: cp4s
-    cp4waiops: cp4waiops
+    cp4aiops: cp4aiops
 online_catalog_source_priority: -1
 storageclass:
   rwo:

config/argocd-cloudpaks/cp4waiops/Chart.yaml → config/argocd-cloudpaks/cp4aiops/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
-name: icp4waiops
-description: Cloud Pak for Watson AIOps
+name: icp4aiops
+description: Cloud Pak for AIOps
 
 # A chart can be either an 'application' or a 'library' chart.
 #

config/argocd-cloudpaks/cp4waiops/templates/100-cp4waiops-app.yaml → config/argocd-cloudpaks/cp4aiops/templates/100-cp4aiops-app.yaml

@@ -3,7 +3,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   creationTimestamp: null
-  name: cp4waiops-app
+  name: cp4aiops-app
   namespace: openshift-gitops
   annotations:
     argocd.argoproj.io/sync-wave: "100"
@@ -43,7 +43,7 @@ spec:
           value: {{.Values.storageclass.rwx}}
         - name: targetRevision
           value: ${ARGOCD_APP_SOURCE_TARGET_REVISION}
-    path: config/argocd-cloudpaks/cp4waiops
+    path: config/argocd-cloudpaks/cp4aiops
     repoURL: {{.Values.repoURL}}
     targetRevision: {{.Values.targetRevision}}
   syncPolicy:

config/argocd-cloudpaks/cp4waiops/templates/110-cp4waiops-aimgr-app.yaml → config/argocd-cloudpaks/cp4aiops/templates/110-cpwaiops-aimgr-app.yaml

@@ -3,7 +3,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   creationTimestamp: null
-  name: cp4waiops-aimgr
+  name: cp4aiops-aimgr
   namespace: openshift-gitops
   annotations:
     argocd.argoproj.io/sync-wave: "110"
@@ -46,7 +46,7 @@ spec:
           value: {{.Values.storageclass.rwx}}
         - name: targetRevision
           value: ${ARGOCD_APP_SOURCE_TARGET_REVISION}
-    path: config/cloudpaks/cp4waiops/install-aimgr
+    path: config/cloudpaks/cp4aiops/install-aimgr
     repoURL: {{.Values.repoURL}}
     targetRevision: {{.Values.targetRevision}}
   syncPolicy:

config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml → config/argocd-cloudpaks/cp4aiops/templates/130-cp4aiops-ia-app.yaml

@@ -5,7 +5,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   creationTimestamp: null
-  name: cp4waiops-ia
+  name: cp4aiops-ia
   namespace: openshift-gitops
   annotations:
     argocd.argoproj.io/sync-wave: "130"
@@ -44,7 +44,7 @@ spec:
           value: {{.Values.storageclass.rwx}}
         - name: targetRevision
           value: ${ARGOCD_APP_SOURCE_TARGET_REVISION}
-    path: config/cloudpaks/cp4waiops/install-ia
+    path: config/cloudpaks/cp4aiops/install-ia
     repoURL: {{.Values.repoURL}}
     targetRevision: {{.Values.targetRevision}}
   syncPolicy:

config/argocd-cloudpaks/cp4waiops/values.yaml → config/argocd-cloudpaks/cp4aiops/values.yaml

@@ -5,7 +5,7 @@ serviceaccount:
   argocd_application_controller: openshift-gitops-argocd-application-controller
   ibm_cloudpaks_installer: ibm-cloudpaks-installer
 metadata:
-  argocd_app_namespace: cp4waiops
+  argocd_app_namespace: cp4aiops
   argocd_namespace: openshift-gitops
 storageclass:
   rwo: ocs-storagecluster-ceph-rbd

config/cloudpaks/cp4waiops/install-aimgr/Chart.yaml → config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
-name: icp4waiops-aimgr
-description: Cloud Pak for Watson AIOps - AI Manager
+name: icp4aiops-aimgr
+description: Cloud Pak for AIOps - AI Manager
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -13,9 +13,9 @@ description: Cloud Pak for Watson AIOps - AI Manager
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
 
-version: 0.15.1
+version: 0.16.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: 4.1.2
+appVersion: 4.2.0

config/cloudpaks/cp4waiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml

@@ -4,7 +4,7 @@ kind: Job
 metadata:
   annotations:
     argocd.argoproj.io/hook: PreSync
-  name: pre-cp4waiops-adjust-parameters
+  name: pre-cp4aiops-adjust-parameters
   namespace: openshift-gitops
 spec:
   template:
@@ -25,17 +25,17 @@ spec:
               set -eo pipefail
               set -x
 
-              storage_class_rwo="$(oc get configmap argocd-cp4waiops-config \
+              storage_class_rwo="$(oc get configmap argocd-cp4aiops-config \
                 --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.storageclass\.rwo}')"
-              storage_class_rwx="$(oc get configmap argocd-cp4waiops-config \
+              storage_class_rwx="$(oc get configmap argocd-cp4aiops-config \
                 --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.storageclass\.rwx}')"
 
               if [ -z "${storage_class_rwo}" ] || [ -z "${storage_class_rwx}" ] ; then
                 echo "ERROR: Did not find storage classes for target platform."
                 exit 1
               fi
 
-               cluster_domain=$(oc get configmap argocd-cp4waiops-config \
+               cluster_domain=$(oc get configmap argocd-cp4aiops-config \
                   --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.cluster_domain}')
 
               echo "INFO: Install Argo CLI."
@@ -55,7 +55,7 @@ spec:
               || result=1
 
               if [ ${result} -eq 0 ]; then
-                  for app_name in cp4waiops-app cp4waiops-aimgr; do
+                  for app_name in cp4aiops-app cp4aiops-aimgr; do
                       if [ -n "${storage_class_rwo}" ] && [ -n "${storage_class_rwx}" ]; then
                           echo "INFO: Patching storage for ${app_name}." \
                           && "${argo_cmd}" app set "${app_name}" \
@@ -68,7 +68,7 @@ spec:
                   done
               fi
 
-              for app_name in cp4waiops-app cp4waiops-aimgr; do
+              for app_name in cp4aiops-app cp4aiops-aimgr; do
                   echo "INFO: Application ${app_name} current parameters:"
                   "${argo_cmd}" app get "${app_name}" --show-params
               done

config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0020-common-services-roles.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0020-common-services-roles.yaml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: common-services-cp4waiops-role
+  name: common-services-cp4aiops-role
   namespace: ibm-common-services
 rules:
   - apiGroups: [""]
@@ -27,7 +27,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: common-services-cp4waiops-role
+  name: common-services-cp4aiops-role
   namespace: {{.Values.metadata.argocd_app_namespace}}
 rules:
   - apiGroups: [""]

config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml

@@ -5,12 +5,12 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "30"
   creationTimestamp: null
-  name: common-services-cp4waiops-binding
+  name: common-services-cp4aiops-binding
   namespace: ibm-common-services
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: common-services-cp4waiops-role
+  name: common-services-cp4aiops-role
 subjects:
   - kind: ServiceAccount
     name: {{.Values.serviceaccount.ibm_cloudpaks_installer}}
@@ -22,12 +22,12 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "30"
   creationTimestamp: null
-  name: common-services-cp4waiops-binding
+  name: common-services-cp4aiops-binding
   namespace: {{.Values.metadata.argocd_app_namespace}}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: common-services-cp4waiops-role
+  name: common-services-cp4aiops-role
 subjects:
   - kind: ServiceAccount
     name: {{.Values.serviceaccount.ibm_cloudpaks_installer}}

config/cloudpaks/cp4waiops/install-aimgr/templates/resources/230-postsync-certificates.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-postsync-certificates.yaml

@@ -7,7 +7,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "230"
     argocd.argoproj.io/hook: Sync
-  name: post-cp4waiops-adjust-certs
+  name: post-cp4aiops-adjust-certs
   namespace: openshift-gitops
 spec:
   template:

config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: argocd-cp4waiops-role
+  name: argocd-cp4aiops-role
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 rules:
   - apiGroups: ["orchestrator.aiops.ibm.com"]

config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml

@@ -5,12 +5,12 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: argocd-cp4waiops-aimgr-binding
+  name: argocd-cp4aiops-aimgr-binding
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: argocd-cp4waiops-role
+  name: argocd-cp4aiops-role
 subjects:
   - kind: ServiceAccount
     name: "{{.Values.serviceaccount.argocd_application_controller}}"

config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/100-subscription.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml

@@ -7,7 +7,7 @@ metadata:
   name: ibm-aiops-orchestrator
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 spec:
-  channel: v4.1
+  channel: v4.2
   installPlanApproval: Automatic
   name: ibm-aiops-orchestrator
   source: ibm-operator-catalog

config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml → config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml

@@ -34,7 +34,7 @@ spec:
 
                 # Note the exclusion of "ibm-automation-elastic" in the statement below, reflecting an
                 # issue with this operator called out in the Cloud Pak docs:
-                # https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.1.0?topic=installation-online-cli#install-cp4waiops
+                # https://www.ibm.com/docs/en/cloud-paks/cloud-pak-aiops/4.2.0?topic=installation-online-cli#install-cp4aiops
 
                 failing_csvs=$(oc get csv \
                     -n ${TARGET_NAMESPACE} \

config/cloudpaks/cp4waiops/install-ia/Chart.yaml → config/cloudpaks/cp4aiops/install-ia/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
-name: icp4waiops-ia
-description: Cloud Pak for Watson AIOps - Infrastructure Automation
+name: icp4aiops-ia
+description: Cloud Pak for AIOps - Infrastructure Automation
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -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.15.0
+version: 0.16.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: 4.1.0
+appVersion: 4.2.0

config/cloudpaks/cp4waiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml → config/cloudpaks/cp4aiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml

@@ -4,7 +4,7 @@ kind: Job
 metadata:
   annotations:
     argocd.argoproj.io/hook: PreSync
-  name: pre-cp4waiops-ia-adjust-parameters
+  name: pre-cp4aiops-ia-adjust-parameters
   namespace: openshift-gitops
 spec:
   template:
@@ -23,9 +23,9 @@ spec:
               set -eo pipefail
               set -x
 
-              storage_class_rwo="$(oc get configmap argocd-cp4waiops-config \
+              storage_class_rwo="$(oc get configmap argocd-cp4aiops-config \
                 --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.storageclass\.rwo}')"
-              storage_class_rwx="$(oc get configmap argocd-cp4waiops-config \
+              storage_class_rwx="$(oc get configmap argocd-cp4aiops-config \
                 --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.storageclass\.rwx}')"
 
               if [ -z "${storage_class_rwo}" ] || [ -z "${storage_class_rwx}" ] ; then
@@ -49,7 +49,7 @@ spec:
               && "${argo_cmd}" login "${argo_url}" --username admin --password "${argo_pwd}" --insecure \
               || result=1
 
-              app_name=cp4waiops-ia
+              app_name=cp4aiops-ia
               if [ ${result} -eq 0 ]; then
                   echo "INFO: Patching storage for ${app_name}." \
                   && "${argo_cmd}" app set "${app_name}" \

config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/020-argocd-role.yaml → config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/020-argocd-role.yaml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: argocd-cp4waiops-ia-role
+  name: argocd-cp4aiops-ia-role
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 rules:
   - apiGroups: ["aiops.ibm.com"]

config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml → config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml

@@ -5,12 +5,12 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "21"
   creationTimestamp: null
-  name: argocd-cp4waiops-ia-binding
+  name: argocd-cp4aiops-ia-binding
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: argocd-cp4waiops-ia-role
+  name: argocd-cp4aiops-ia-role
 subjects:
   - kind: ServiceAccount
     name: "{{.Values.serviceaccount.argocd_application_controller}}"

config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/100-subscription.yaml → config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/100-subscription.yaml

@@ -7,7 +7,7 @@ metadata:
   name: ibm-infrastructure-automation-operator
   namespace: "{{.Values.metadata.argocd_app_namespace}}"
 spec:
-  channel: v4.1
+  channel: v4.2
   installPlanApproval: Automatic
   name: ibm-infrastructure-automation-operator
   source: ibm-operator-catalog

config/rhacm/cloudpaks/templates/placement-argocd.yaml

@@ -1,4 +1,4 @@
-{{- range tuple "cp4a" "cp4waiops" "cp4d" "cp4i" "cp4s" }}
+{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
 ---
 apiVersion: apps.open-cluster-management.io/v1
 kind: PlacementRule

config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml

@@ -1,4 +1,4 @@
-{{- range tuple "cp4a" "cp4waiops" "cp4d" "cp4i" "cp4s" }}
+{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
 ---
 apiVersion: apps.open-cluster-management.io/v1
 kind: PlacementRule

config/rhacm/cloudpaks/templates/placement-cp-shared.yaml

@@ -1,4 +1,4 @@
-{{- range tuple "cp4a" "cp4waiops" "cp4d" "cp4i" "cp4s" }}
+{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
 ---
 apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding