feat: Upgrade CP4I to 2023.4

Signed-off-by: Denilson Nastacio <[email protected]>
IBM · Dec 14, 2023 · 411396a · 411396a
1 parent b0b6b59
commit 411396a
Show file tree

Hide file tree

Showing 27 changed files with 239 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Supported versions:
 | ----------|---------|-------------------|
 | Cloud Pak for Business Automation | [23.0.1](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/23.0.1) | Multi-pattern starter deployment |
 | Cloud Pak for Data | [4.8.0](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.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 Integration | [2023.4](https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.4) | 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 AIOps\* | [4.3.0](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.3.0) | Starter Installation |
 

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
@@ -39,9 +39,6 @@ spec:
                 common-service-maps.yaml: |
                   controlNamespace: {{.Values.dedicated_cs.control_namespace}}
                   namespaceMapping:
-                  - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4i}}
-                    requested-from-namespace:
-                    - {{.Values.dedicated_cs.namespace_mapping.cp4i}}
                   - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4s}}-cs
                     requested-from-namespace:
                     - {{.Values.dedicated_cs.namespace_mapping.cp4s}}

diff --git a/config/argocd-cloudpaks/cp4i/Chart.yaml b/config/argocd-cloudpaks/cp4i/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: 0.8.3
+version: 0.10.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: "2023.2.1"
+appVersion: "2023.4.1"
diff --git a/config/argocd-cloudpaks/cp4i/templates/0100-cp4i-app.yaml b/config/argocd-cloudpaks/cp4i/templates/0100-cp4i-app.yaml
@@ -39,6 +39,8 @@ spec:
           value: "{{.Values.modules.client}}"
         - name: modules.mq
           value: "{{.Values.modules.mq}}"
+        - name: red_hat_cert_manager
+          value: "{{.Values.red_hat_cert_manager | toString}}"
         - name: repoURL
           value: ${ARGOCD_APP_SOURCE_REPO_URL}
         - name: serviceaccount.argocd_application_controller

diff --git a/config/argocd-cloudpaks/cp4i/templates/0200-cp4i-prereqs-app.yaml b/config/argocd-cloudpaks/cp4i/templates/0200-cp4i-prereqs-app.yaml
@@ -22,6 +22,8 @@ spec:
           value: {{.Values.metadata.argocd_app_namespace}}
         - name: metadata.operators_namespace
           value: {{.Values.metadata.operators_namespace}}
+        - name: red_hat_cert_manager
+          value: "{{.Values.red_hat_cert_manager | toString}}"
         - name: repoURL
           value: ${ARGOCD_APP_SOURCE_REPO_URL}
         - name: serviceaccount.argocd_application_controller

diff --git a/config/argocd-cloudpaks/cp4i/values.yaml b/config/argocd-cloudpaks/cp4i/values.yaml
@@ -1,12 +1,15 @@
 ---
 repoURL: https://github.com/IBM/cloudpak-gitops
 targetRevision: main
+red_hat_cert_manager: false
 serviceaccount:
   ibm_cloudpaks_installer: ibm-cp4i-installer
   argocd_application_controller: openshift-gitops-argocd-application-controller
 metadata:
   argocd_app_namespace: cp4i
   argocd_namespace: openshift-gitops
+  cert_manager_namespace: ibm-cert-manager
+  cert_manager_channel: v4.2
 storageclass:
   rwo: ocs-storagecluster-ceph-rbd
   rwx: ocs-storagecluster-cephfs

diff --git a/config/cloudpaks/cp-shared/operators/templates/0050-catalog-source-foundation-services.yaml b/config/cloudpaks/cp-shared/operators/templates/0050-catalog-source-foundation-services.yaml
@@ -0,0 +1,29 @@
+---
+# https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.4?topic=images-adding-catalog-sources-cluster
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: cloud-native-postgresql-catalog
+  namespace: openshift-marketplace
+spec:
+  displayName: ibm-cloud-native-postgresql-4.18.0
+  publisher: IBM
+  image: icr.io/cpopen/ibm-cpd-cloud-native-postgresql-operator-catalog@sha256:c96aa2e6bce92f2e5e4874116cf1cc1cdd60676499cd04ab1631462b8b883357
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: opencloud-operators
+  namespace: openshift-marketplace
+spec:
+  displayName: ibm-cp-common-services-4.3.0
+  publisher: IBM
+  image: icr.io/cpopen/ibm-common-service-catalog@sha256:5f2ada10db36dd609913f806fc44051186a1b719a0c1e04edfae5a6807b0eb26
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s
diff --git a/config/cloudpaks/cp4i/install-apic/Chart.yaml b/config/cloudpaks/cp4i/install-apic/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: 0.4.0
+version: 0.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "2023.2.1"
+appVersion: "2023.4.1"
diff --git a/config/cloudpaks/cp4i/install-apic/templates/0050-catalog-source-apic.yaml b/config/cloudpaks/cp4i/install-apic/templates/0050-catalog-source-apic.yaml
@@ -0,0 +1,17 @@
+---
+# https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.4?topic=images-adding-catalog-sources-cluster
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "50"
+  name: ibm-apiconnect-catalog
+  namespace: openshift-marketplace
+spec:
+  displayName: ibm-apiconnect-5.1.0
+  publisher: IBM
+  image: icr.io/cpopen/ibm-apiconnect-catalog@sha256:2058d863696e3adccd620ab3210a84f792c2953e42a9b61f350b4ad897723f1e
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s
diff --git a/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml b/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml
@@ -9,8 +9,8 @@ metadata:
   name: ibm-apiconnect
   namespace: {{.Values.metadata.argocd_app_namespace}}
 spec:
-  channel: v5.0
+  channel: v5.1
   installPlanApproval: Automatic
   name: ibm-apiconnect
-  source: ibm-operator-catalog
+  source: ibm-apiconnect-catalog
   sourceNamespace: openshift-marketplace
diff --git a/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml b/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml
@@ -4,6 +4,7 @@ apiVersion: apiconnect.ibm.com/v1beta1
 kind: APIConnectCluster
 metadata:
   annotations:
+    apiconnect-operator/backups-not-configured: "true"
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: "200"
   labels:
@@ -13,11 +14,21 @@ metadata:
   name: apis-minimum
   namespace: {{.Values.metadata.argocd_app_namespace}}
 spec:
+  analytics:
+    ingestion:
+      queue:
+        type: persisted
+    storage:
+      enabled: true
+      type: shared
+    mtlsValidateClient: true
   license:
     accept: true
     use: nonproduction
-    # https://www.ibm.com/docs/en/api-connect/10.0.5.x_lts?topic=requirements-api-connect-licenses
-    license: L-KZXM-S7SNCU
+    # https://www.ibm.com/docs/en/api-connect/10.0.x?topic=requirements-api-connect-licenses
+    license: L-MMBZ-295QZQ
+  portal:
+    mtlsValidateClient: true
   storageClassName: {{.Values.storageclass.rwo}}
   profile: n1xc10.m48
-  version: 10.0.6.0
+  version: 10.0.7.0
diff --git a/config/cloudpaks/cp4i/install-client/templates/0300-node-imagestream.yaml b/config/cloudpaks/cp4i/install-client/templates/0300-node-imagestream.yaml
diff --git a/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-build-config.yaml b/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-build-config.yaml
diff --git a/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-deployment.yaml b/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-deployment.yaml
diff --git a/config/cloudpaks/cp4i/install-mq/Chart.yaml b/config/cloudpaks/cp4i/install-mq/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: 0.4.0
+version: 0.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "2023.2.1"
+appVersion: "2023.4.1"
diff --git a/config/cloudpaks/cp4i/install-mq/templates/0050-catalog-source-mq.yaml b/config/cloudpaks/cp4i/install-mq/templates/0050-catalog-source-mq.yaml
@@ -0,0 +1,17 @@
+---
+# https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.4?topic=images-adding-catalog-sources-cluster
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "50"
+  name: ibmmq-operator-catalogsource
+  namespace: openshift-marketplace
+spec:
+  displayName: ibm-mq-3.0.0
+  publisher: IBM
+  image: icr.io/cpopen/ibm-mq-operator-catalog@sha256:99b43b78e103fa18ea91827286c865219493a056e6f002096558a2dd1655c9b7
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s
diff --git a/config/cloudpaks/cp4i/install-mq/templates/0100-subscription-mq.yaml b/config/cloudpaks/cp4i/install-mq/templates/0100-subscription-mq.yaml
@@ -8,8 +8,8 @@ metadata:
   name: ibm-mq-ibm-operator
   namespace: {{.Values.metadata.argocd_app_namespace}}
 spec:
-  channel: v2.4
+  channel: v3.0
   installPlanApproval: Automatic
   name: ibm-mq
-  source: ibm-operator-catalog
+  source: ibmmq-operator-catalogsource
   sourceNamespace: openshift-marketplace
diff --git a/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml b/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml
@@ -8,11 +8,11 @@ metadata:
   name: case-queues-1-qmgr
   namespace: {{.Values.argocd_app_namespace}}
 spec:
-  version: 9.3.3.0-r1
+  version: 9.3.4.0-r1
   license:
     accept: true
     # http://ibm.biz/BdqvCF
-    license: L-YBXJ-ADJNSM
+    license: L-VTPK-22YZPK
     use: NonProduction
   web:
     enabled: true

diff --git a/config/cloudpaks/cp4i/install-platform/Chart.yaml b/config/cloudpaks/cp4i/install-platform/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: 0.4.0
+version: 0.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "2023.2.1"
+appVersion: "2023.4.1"
diff --git a/config/cloudpaks/cp4i/install-platform/templates/0050-catalog-source-platform-navigator.yaml b/config/cloudpaks/cp4i/install-platform/templates/0050-catalog-source-platform-navigator.yaml
@@ -0,0 +1,17 @@
+---
+# https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.4?topic=images-adding-catalog-sources-cluster
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "50"
+  name: ibm-integration-platform-navigator-catalog
+  namespace: openshift-marketplace
+spec:
+  displayName: ibm-integration-platform-navigator-7.2.0
+  publisher: IBM
+  image: icr.io/cpopen/ibm-integration-platform-navigator-catalog@sha256:6696f54af1d2cc0a97d2014fd56538e937299a693a171d0424a535027c942149
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s