From a2e46fa3a60f3cb45ee5f9bdf166859af7000d97 Mon Sep 17 00:00:00 2001 From: Denilson Nastacio Date: Tue, 3 Oct 2023 11:57:11 -0400 Subject: [PATCH] feat: Upgrade Cloud Pak for WAIOps to 4.2.0 Signed-off-by: Denilson Nastacio --- README.md | 4 +++- .../0050-sync-common-config-map.yaml | 2 +- .../0050-sync-common-service-maps.yaml | 4 ++-- .../templates/0100-cp-shared-app.yaml | 4 ++-- config/argocd-cloudpaks/cp-shared/values.yaml | 2 +- .../{cp4waiops => cp4aiops}/.helmignore | 0 .../{cp4waiops => cp4aiops}/Chart.yaml | 4 ++-- .../templates/000-aimgr-namespace.yaml | 0 .../templates/020-cloudpaks-aimgr-role.yaml | 0 .../templates/020-cloudpaks-default-role.yaml | 0 .../020-cloudpaks-ingress-roles.yaml | 0 .../021-cloudpaks-aimgr-binding.yaml | 0 .../021-cloudpaks-default-binding.yaml | 0 .../021-cloudpaks-ingress-bindings.yaml | 0 .../templates/100-cp4aiops-app.yaml} | 4 ++-- .../templates/110-cpwaiops-aimgr-app.yaml} | 4 ++-- .../templates/130-cp4aiops-ia-app.yaml} | 4 ++-- .../{cp4waiops => cp4aiops}/values.yaml | 2 +- .../install-aimgr/.helmignore | 0 .../install-aimgr/Chart.yaml | 8 ++++---- .../000-presync-adjust-parameters.yaml | 12 +++++------ .../resources/0020-common-services-roles.yaml | 4 ++-- .../0030-common-services-role-bindings.yaml | 8 ++++---- .../templates/resources/200-ai-manager.yaml | 0 .../resources/230-postsync-certificates.yaml | 2 +- .../subscriptions/020-argocd-role.yaml | 2 +- .../021-argocd-role-binding.yaml | 4 ++-- .../subscriptions/030-sync-prereqs.yaml | 0 .../subscriptions/050-operator-group.yaml | 0 .../subscriptions/100-subscription.yaml | 2 +- .../110-sync-check-all-csvs.yaml | 2 +- .../install-aimgr/values.yaml | 0 .../install-ia/.helmignore | 0 .../install-ia/Chart.yaml | 8 ++++---- .../000-presync-adjust-parameters.yaml | 8 ++++---- .../templates/resources/200-ia-config.yaml | 0 .../subscriptions/020-argocd-role.yaml | 2 +- .../021-argocd-role-binding.yaml | 4 ++-- .../subscriptions/100-subscription.yaml | 2 +- .../install-ia/values.yaml | 0 .../cloudpaks/templates/placement-argocd.yaml | 2 +- .../templates/placement-cloudpaks.yaml | 2 +- .../templates/placement-cp-shared.yaml | 2 +- ...cy-cp4waiops.yaml => policy-cpwaiops.yaml} | 20 +++++++++---------- docs/install.md | 17 ++++++++-------- docs/rhacm.md | 6 +++--- tests/postbuild/calc-settings.sh | 2 +- tests/prebuild/yamllint-config.yaml | 6 +++--- 48 files changed, 81 insertions(+), 78 deletions(-) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/.helmignore (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/Chart.yaml (94%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/000-aimgr-namespace.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/020-cloudpaks-aimgr-role.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/020-cloudpaks-default-role.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/020-cloudpaks-ingress-roles.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/021-cloudpaks-aimgr-binding.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/021-cloudpaks-default-binding.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/templates/021-cloudpaks-ingress-bindings.yaml (100%) rename config/argocd-cloudpaks/{cp4waiops/templates/100-cp4waiops-app.yaml => cp4aiops/templates/100-cp4aiops-app.yaml} (96%) rename config/argocd-cloudpaks/{cp4waiops/templates/110-cp4waiops-aimgr-app.yaml => cp4aiops/templates/110-cpwaiops-aimgr-app.yaml} (95%) rename config/argocd-cloudpaks/{cp4waiops/templates/130-cp4waiops-ia-app.yaml => cp4aiops/templates/130-cp4aiops-ia-app.yaml} (96%) rename config/argocd-cloudpaks/{cp4waiops => cp4aiops}/values.yaml (91%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/.helmignore (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/Chart.yaml (87%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml (88%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/resources/0020-common-services-roles.yaml (93%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml (83%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/resources/200-ai-manager.yaml (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/resources/230-postsync-certificates.yaml (99%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/020-argocd-role.yaml (92%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml (86%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/050-operator-group.yaml (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/100-subscription.yaml (95%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml (96%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-aimgr/values.yaml (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/.helmignore (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/Chart.yaml (89%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/templates/resources/000-presync-adjust-parameters.yaml (91%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/templates/resources/200-ia-config.yaml (100%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/templates/subscriptions/020-argocd-role.yaml (90%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/templates/subscriptions/021-argocd-role-binding.yaml (86%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/templates/subscriptions/100-subscription.yaml (96%) rename config/cloudpaks/{cp4waiops => cp4aiops}/install-ia/values.yaml (100%) rename config/rhacm/cloudpaks/templates/{policy-cp4waiops.yaml => policy-cpwaiops.yaml} (80%) diff --git a/README.md b/README.md index 64a3b0e7..c43d2efd 100644 --- a/README.md +++ b/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 diff --git a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml index 05913179..a1437bd6 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-config-map.yaml +++ b/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 diff --git a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml index 0ee1414c..b65a82f9 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml +++ b/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." diff --git a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml index deb68cd6..0849561e 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml +++ b/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 diff --git a/config/argocd-cloudpaks/cp-shared/values.yaml b/config/argocd-cloudpaks/cp-shared/values.yaml index b55fc151..91500959 100644 --- a/config/argocd-cloudpaks/cp-shared/values.yaml +++ b/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: diff --git a/config/argocd-cloudpaks/cp4waiops/.helmignore b/config/argocd-cloudpaks/cp4aiops/.helmignore similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/.helmignore rename to config/argocd-cloudpaks/cp4aiops/.helmignore diff --git a/config/argocd-cloudpaks/cp4waiops/Chart.yaml b/config/argocd-cloudpaks/cp4aiops/Chart.yaml similarity index 94% rename from config/argocd-cloudpaks/cp4waiops/Chart.yaml rename to config/argocd-cloudpaks/cp4aiops/Chart.yaml index e52663f6..7593fd97 100644 --- a/config/argocd-cloudpaks/cp4waiops/Chart.yaml +++ b/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. # diff --git a/config/argocd-cloudpaks/cp4waiops/templates/000-aimgr-namespace.yaml b/config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/000-aimgr-namespace.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-aimgr-role.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-aimgr-role.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-default-role.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-default-role.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-ingress-roles.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/020-cloudpaks-ingress-roles.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-aimgr-binding.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-aimgr-binding.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-default-binding.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-default-binding.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-ingress-bindings.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4waiops/templates/021-cloudpaks-ingress-bindings.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml diff --git a/config/argocd-cloudpaks/cp4waiops/templates/100-cp4waiops-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/100-cp4aiops-app.yaml similarity index 96% rename from config/argocd-cloudpaks/cp4waiops/templates/100-cp4waiops-app.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/100-cp4aiops-app.yaml index 3892e18e..322759d9 100644 --- a/config/argocd-cloudpaks/cp4waiops/templates/100-cp4waiops-app.yaml +++ b/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: diff --git a/config/argocd-cloudpaks/cp4waiops/templates/110-cp4waiops-aimgr-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/110-cpwaiops-aimgr-app.yaml similarity index 95% rename from config/argocd-cloudpaks/cp4waiops/templates/110-cp4waiops-aimgr-app.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/110-cpwaiops-aimgr-app.yaml index 26236f95..ed205bc9 100644 --- a/config/argocd-cloudpaks/cp4waiops/templates/110-cp4waiops-aimgr-app.yaml +++ b/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: diff --git a/config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/130-cp4aiops-ia-app.yaml similarity index 96% rename from config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/130-cp4aiops-ia-app.yaml index 1785adff..310044ca 100644 --- a/config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml +++ b/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: diff --git a/config/argocd-cloudpaks/cp4waiops/values.yaml b/config/argocd-cloudpaks/cp4aiops/values.yaml similarity index 91% rename from config/argocd-cloudpaks/cp4waiops/values.yaml rename to config/argocd-cloudpaks/cp4aiops/values.yaml index 1e0c1719..1db010a4 100644 --- a/config/argocd-cloudpaks/cp4waiops/values.yaml +++ b/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 diff --git a/config/cloudpaks/cp4waiops/install-aimgr/.helmignore b/config/cloudpaks/cp4aiops/install-aimgr/.helmignore similarity index 100% rename from config/cloudpaks/cp4waiops/install-aimgr/.helmignore rename to config/cloudpaks/cp4aiops/install-aimgr/.helmignore diff --git a/config/cloudpaks/cp4waiops/install-aimgr/Chart.yaml b/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml similarity index 87% rename from config/cloudpaks/cp4waiops/install-aimgr/Chart.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml index f53105c5..3142a259 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/Chart.yaml +++ b/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 diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml similarity index 88% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml index 6074763c..d22173d4 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml +++ b/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,9 +25,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 @@ -35,7 +35,7 @@ spec: 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 diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0020-common-services-roles.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0020-common-services-roles.yaml similarity index 93% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0020-common-services-roles.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0020-common-services-roles.yaml index 67980a15..599d7d72 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0020-common-services-roles.yaml +++ b/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: [""] diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml similarity index 83% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml index c1846b94..84cdbf6b 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/0030-common-services-role-bindings.yaml +++ b/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}} diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/200-ai-manager.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/200-ai-manager.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/resources/200-ai-manager.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/resources/200-ai-manager.yaml diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/230-postsync-certificates.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-postsync-certificates.yaml similarity index 99% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/resources/230-postsync-certificates.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-postsync-certificates.yaml index 2bbb9798..1199cbbd 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/resources/230-postsync-certificates.yaml +++ b/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: diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml similarity index 92% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml index e37249f6..57cd1f70 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml +++ b/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"] diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml similarity index 86% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml index bc54d197..ce968196 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml +++ b/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}}" diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/050-operator-group.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/050-operator-group.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/050-operator-group.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/050-operator-group.yaml diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/100-subscription.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml similarity index 95% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/100-subscription.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml index 844fd5b3..e5d1630b 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/100-subscription.yaml +++ b/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 diff --git a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml similarity index 96% rename from config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml index 1c41ccb9..bf752f0e 100644 --- a/config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml +++ b/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} \ diff --git a/config/cloudpaks/cp4waiops/install-aimgr/values.yaml b/config/cloudpaks/cp4aiops/install-aimgr/values.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-aimgr/values.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/values.yaml diff --git a/config/cloudpaks/cp4waiops/install-ia/.helmignore b/config/cloudpaks/cp4aiops/install-ia/.helmignore similarity index 100% rename from config/cloudpaks/cp4waiops/install-ia/.helmignore rename to config/cloudpaks/cp4aiops/install-ia/.helmignore diff --git a/config/cloudpaks/cp4waiops/install-ia/Chart.yaml b/config/cloudpaks/cp4aiops/install-ia/Chart.yaml similarity index 89% rename from config/cloudpaks/cp4waiops/install-ia/Chart.yaml rename to config/cloudpaks/cp4aiops/install-ia/Chart.yaml index 4d621e93..bc5cd3af 100644 --- a/config/cloudpaks/cp4waiops/install-ia/Chart.yaml +++ b/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 diff --git a/config/cloudpaks/cp4waiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml b/config/cloudpaks/cp4aiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml similarity index 91% rename from config/cloudpaks/cp4waiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml rename to config/cloudpaks/cp4aiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml index 3ea7f76b..6cc60ce4 100644 --- a/config/cloudpaks/cp4waiops/install-ia/templates/resources/000-presync-adjust-parameters.yaml +++ b/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}" \ diff --git a/config/cloudpaks/cp4waiops/install-ia/templates/resources/200-ia-config.yaml b/config/cloudpaks/cp4aiops/install-ia/templates/resources/200-ia-config.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-ia/templates/resources/200-ia-config.yaml rename to config/cloudpaks/cp4aiops/install-ia/templates/resources/200-ia-config.yaml diff --git a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/020-argocd-role.yaml b/config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/020-argocd-role.yaml similarity index 90% rename from config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/020-argocd-role.yaml rename to config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/020-argocd-role.yaml index c39efb5d..23cc2b4e 100644 --- a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/020-argocd-role.yaml +++ b/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"] diff --git a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml b/config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml similarity index 86% rename from config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml rename to config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml index b007dff5..0f6ffda2 100644 --- a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/021-argocd-role-binding.yaml +++ b/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}}" diff --git a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/100-subscription.yaml b/config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/100-subscription.yaml similarity index 96% rename from config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/100-subscription.yaml rename to config/cloudpaks/cp4aiops/install-ia/templates/subscriptions/100-subscription.yaml index 7e052442..5eed3bb1 100644 --- a/config/cloudpaks/cp4waiops/install-ia/templates/subscriptions/100-subscription.yaml +++ b/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 diff --git a/config/cloudpaks/cp4waiops/install-ia/values.yaml b/config/cloudpaks/cp4aiops/install-ia/values.yaml similarity index 100% rename from config/cloudpaks/cp4waiops/install-ia/values.yaml rename to config/cloudpaks/cp4aiops/install-ia/values.yaml diff --git a/config/rhacm/cloudpaks/templates/placement-argocd.yaml b/config/rhacm/cloudpaks/templates/placement-argocd.yaml index 02ba04f9..96601e7a 100644 --- a/config/rhacm/cloudpaks/templates/placement-argocd.yaml +++ b/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 diff --git a/config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml b/config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml index 7d9a25a4..b9c8ab59 100644 --- a/config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml +++ b/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 diff --git a/config/rhacm/cloudpaks/templates/placement-cp-shared.yaml b/config/rhacm/cloudpaks/templates/placement-cp-shared.yaml index 15a1dea2..236c9902 100644 --- a/config/rhacm/cloudpaks/templates/placement-cp-shared.yaml +++ b/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 diff --git a/config/rhacm/cloudpaks/templates/policy-cp4waiops.yaml b/config/rhacm/cloudpaks/templates/policy-cpwaiops.yaml similarity index 80% rename from config/rhacm/cloudpaks/templates/policy-cp4waiops.yaml rename to config/rhacm/cloudpaks/templates/policy-cpwaiops.yaml index d3388355..c04f86db 100644 --- a/config/rhacm/cloudpaks/templates/policy-cp4waiops.yaml +++ b/config/rhacm/cloudpaks/templates/policy-cpwaiops.yaml @@ -2,7 +2,7 @@ apiVersion: policy.open-cluster-management.io/v1 kind: Policy metadata: - name: openshift-gitops-cloudpaks-cp4waiops + name: openshift-gitops-cloudpaks-cp4aiops namespace: policy annotations: argocd.argoproj.io/compare-options: IgnoreExtraneous @@ -19,7 +19,7 @@ spec: apiVersion: policy.open-cluster-management.io/v1 kind: ConfigurationPolicy metadata: - name: openshift-gitops-cloudpaks-cp4waiops + name: openshift-gitops-cloudpaks-cp4aiops spec: remediationAction: enforce severity: medium @@ -34,13 +34,13 @@ spec: apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: cp4waiops-app + name: cp4aiops-app # Look up used to delay the application of the policy # until this secret is created namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}' spec: destination: - namespace: '{{ "{{ fromClusterClaim \"cp4waiops\" }}" }}' + namespace: '{{ "{{ fromClusterClaim \"cp4aiops\" }}" }}' server: https://kubernetes.default.svc project: default source: @@ -51,20 +51,20 @@ spec: - name: argocd_app_namespace value: ${ARGOCD_APP_NAMESPACE} - name: cluster_domain - value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4waiops-config\" \"cluster_domain\" }}" }}' + value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4aiops-config\" \"cluster_domain\" }}" }}' - name: metadata.argocd_app_namespace - value: '{{ "{{ fromClusterClaim \"cp4waiops\" }}" }}' + value: '{{ "{{ fromClusterClaim \"cp4aiops\" }}" }}' - name: repoURL value: ${ARGOCD_APP_SOURCE_REPO_URL} - name: serviceaccount.argocd_application_controller - value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4waiops-config\" \"serviceaccount.argocd_application_controller\" }}" }}' + value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4aiops-config\" \"serviceaccount.argocd_application_controller\" }}" }}' - name: storageclass.rwo - value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4waiops-config\" \"storageclass.rwo\" }}" }}' + value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4aiops-config\" \"storageclass.rwo\" }}" }}' - name: storageclass.rwx - value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4waiops-config\" \"storageclass.rwx\" }}" }}' + value: '{{ "{{ fromConfigMap \"openshift-gitops\" \"argocd-cp4aiops-config\" \"storageclass.rwx\" }}" }}' - name: targetRevision value: ${ARGOCD_APP_SOURCE_TARGET_REVISION} - path: config/argocd-cloudpaks/cp4waiops + path: config/argocd-cloudpaks/cp4aiops repoURL: {{.Values.repoURL}} targetRevision: '{{ "{{ fromClusterClaim \"gitops-branch\" }}" }}' syncPolicy: diff --git a/docs/install.md b/docs/install.md index 6651b800..769369b8 100644 --- a/docs/install.md +++ b/docs/install.md @@ -221,7 +221,7 @@ After completing the list of activities listed in the previous sections, you can | dedicated_cs.namespace_mapping.cp4d | cp4d | | dedicated_cs.namespace_mapping.cp4i | cp4i | | dedicated_cs.namespace_mapping.cp4s | cp4s | - | dedicated_cs.namespace_mapping.cp4waiops | cp4waiops | + | dedicated_cs.namespace_mapping.cp4aiops | cp4aiops | 1. After filling out the form details, click the "Create" button @@ -235,7 +235,7 @@ After completing the list of activities listed in the previous sections, you can | Data | cp4d-app | config/argocd-cloudpaks/cp4d | cp4d | | Integration | cp4i-app | config/argocd-cloudpaks/cp4i | cp4i | | Security | cp4s-app | config/argocd-cloudpaks/cp4s | cp4s | - | Watson AIOps | cp4waiops-app | config/argocd-cloudpaks/cp4waiops | cp4waiops | + | AIOps | cp4aiops-app | config/argocd-cloudpaks/cp4aiops | cp4aiops | For all other fields, use the following values: @@ -318,12 +318,13 @@ After completing the list of activities listed in the previous sections, you can # If you want to override the default target namespace for # one or more Cloud Paks, you need to adjust the values below # to indicate the desired target namespace. - # dedicated_cs.enabled=true + # dedicated_cs_enabled=true + dedicated_cs_enabled=false cp4a_namespace=cp4a cp4d_namespace=cp4d cp4i_namespace=cp4i cp4s_namespace=cp4s - cp4waiops_namespace=cp4waiops + cp4aiops_namespace=cp4aiops argocd app create cp-shared-app \ --project default \ @@ -333,12 +334,12 @@ After completing the list of activities listed in the previous sections, you can --path config/argocd-cloudpaks/cp-shared \ --helm-set-string argocd_app_namespace="${cp_namespace}" \ --helm-set-string metadata.argocd_app_namespace="${cp_namespace}" \ - --helm-set-string dedicated_cs.enabled="${dedicated_cs.enabled:-false}" \ + --helm-set-string dedicated_cs.enabled="${dedicated_cs_enabled:-false}" \ --helm-set-string dedicated_cs.namespace_mapping.cp4a="${cp4a_namespace}" \ --helm-set-string dedicated_cs.namespace_mapping.cp4d="${cp4d_namespace}" \ --helm-set-string dedicated_cs.namespace_mapping.cp4i="${cp4i_namespace}" \ --helm-set-string dedicated_cs.namespace_mapping.cp4s="${cp4s_namespace}" \ - --helm-set-string dedicated_cs.namespace_mapping.cp4waiops="${cp4waiops_namespace}" \ + --helm-set-string dedicated_cs.namespace_mapping.cp4aiops="${cp4aiops_namespace}" \ --sync-policy automated \ --revision ${gitops_branch:?} \ --upsert @@ -349,7 +350,7 @@ After completing the list of activities listed in the previous sections, you can ```sh # appname=<< choose a value from the "Application Name" column in the # table of Cloud Paks above, such as cp4a-app, cp4i-app, - # cp4waiops-app, cp4d-app, etc >> + # cp4aiops-app, cp4d-app, etc >> cp=cp4i # Note that if you want to use a target namespace that is not the @@ -390,7 +391,7 @@ After completing the list of activities listed in the previous sections, you can argocd app wait "${app_name}" \ --sync \ --health \ - --operations \ + --operation \ --timeout 3600 ``` diff --git a/docs/rhacm.md b/docs/rhacm.md index d9efc046..cb330bfc 100644 --- a/docs/rhacm.md +++ b/docs/rhacm.md @@ -82,7 +82,7 @@ Once Argo completes synchronizing the applications, your cluster will have polic - `openshift-gitops-cloudpaks-cp-shared`: Deploys common Cloud Pak prerequisites. - `openshift-gitops-cloudpaks-cp4a`: Deploys the Argo applications for Cloud Pak for Business Automation. - `openshift-gitops-cloudpaks-cp4d`: Deploys the Argo applications for Cloud Pak for Data. -- `openshift-gitops-cloudpaks-cp4waiops`: Deploys the Argo applications for Cloud Pak for Watson AIOps. +- `openshift-gitops-cloudpaks-cp4aiops`: Deploys the Argo applications for Cloud Pak for AIOps. - `openshift-gitops-cloudpaks-cp4i`: Deploys the Argo applications for Cloud Pak for Integration. - `openshift-gitops-cloudpaks-cp4s`: Deploys the Argo applications for Cloud Pak for Security. - `openshift-gitops-installed`: Deploys OpenShift GitOps. @@ -95,14 +95,14 @@ Labels: - `gitops-branch` + `cp4d`: Placement for Cloud Pak for Data. - `gitops-branch` + `cp4i`: Placement for Cloud Pak for Integration. - `gitops-branch` + `cp4s`: Placement for Cloud Pak for Security. -- `gitops-branch` + `cp4waiops`: Placement for Cloud Pak for Watson AIOps. +- `gitops-branch` + `cp4aiops`: Placement for Cloud Pak for AIOps. - `gitops-remote` + `true`: Assign cluster to the `gitops-cluster` cluster-set, registering it to the [GitOps Cluster](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.7/html/applications/managing-applications#gitops-config). Values for each label: - `gitops-branch`: Branch of this repo for the Argo applications. Unless you are developing and testing on a new branch, use the default value `main`. - cp4a: Namespace for deploying the Cloud Pak. Unless you want multiple Cloud Paks in different namespaces of the cluster, use the default value `ibm-cloudpaks`. -- `cp4waiops`: Namespace for deploying the Cloud Pak. Unless you want multiple Cloud Paks in different namespaces of the cluster, use the default value `ibm-cloudpaks`. +- `cp4aiops`: Namespace for deploying the Cloud Pak. Unless you want multiple Cloud Paks in different namespaces of the cluster, use the default value `ibm-cloudpaks`. - `cp4d`: Namespace for deploying the Cloud Pak. As of release 4.0.6, and as a product limitation, do not use the same namespace as other Cloud Paks if installing Cloud Pak for Data to the same cluster. - `cp4i`: Namespace for deploying the Cloud Pak. Unless you want multiple Cloud Paks in different namespaces of the cluster, use the default value `ibm-cloudpaks`. - `cp4s`: Namespace for deploying the Cloud Pak. Unless you want multiple Cloud Paks in different namespaces of the cluster, use the default value `ibm-cloudpaks`. diff --git a/tests/postbuild/calc-settings.sh b/tests/postbuild/calc-settings.sh index 1632aee6..01624736 100755 --- a/tests/postbuild/calc-settings.sh +++ b/tests/postbuild/calc-settings.sh @@ -132,7 +132,7 @@ cd "${WORKDIR}" branch_delta_output_file="${WORKDIR}/diff.txt" extract_branch_delta "${branch_delta_output_file}" -for cloudpak in cp4a cp4d cp4i cp4waiops cp4s +for cloudpak in cp4a cp4d cp4i cp4aiops cp4s do if grep "/${cloudpak}/" "${branch_delta_output_file}"; then labels="${labels},${cloudpak}:${cloudpak}" diff --git a/tests/prebuild/yamllint-config.yaml b/tests/prebuild/yamllint-config.yaml index 80e87b01..fb3011e1 100644 --- a/tests/prebuild/yamllint-config.yaml +++ b/tests/prebuild/yamllint-config.yaml @@ -4,15 +4,15 @@ ignore: | config/argocd-cloudpaks/cp4d/templates/0000-app-namespace.yaml config/argocd-cloudpaks/cp4i/templates/0301-cp4i-module-template-app.yaml config/argocd-cloudpaks/cp4i/templates/0400-cp4i-client-app.yaml - config/argocd-cloudpaks/cp4waiops/templates/000-aimgr-namespace.yaml - config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml + config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml + config/argocd-cloudpaks/cp4aiops/templates/130-cp4aiops-ia-app.yaml config/cloudpaks/cp4a/operators/templates/0000-cp4ba-namespace.yaml config/cloudpaks/cp4a/operators/templates/0100-operator-group.yaml config/cloudpaks/cp4i/install-prereqs/templates/0000-namespace.yaml config/cloudpaks/cp4i/install-prereqs/templates/0100-operator-group.yaml config/cloudpaks/cp4s/templates/resources/200-cp4s-threat-mgmt.yaml config/cloudpaks/cp4s/templates/subscriptions/050-cp4s-operator-group.yaml - config/cloudpaks/cp4waiops/install-aimgr/templates/subscriptions/050-operator-group.yaml + config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/050-operator-group.yaml config/rhacm/cloudpaks/templates/placement-argocd.yaml config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml config/rhacm/cloudpaks/templates/placement-cp-shared.yaml