From a24f4a3eb43c2f0550ed91848252479e50405978 Mon Sep 17 00:00:00 2001 From: Denilson Nastacio Date: Wed, 13 Dec 2023 17:20:34 -0500 Subject: [PATCH] feat: Upgrade CP4I to 2023.4 Signed-off-by: Denilson Nastacio --- README.md | 2 +- config/argocd-cloudpaks/cp4i/Chart.yaml | 4 +- ...50-catalog-source-foundation-services.yaml | 29 +++++++++++++++ config/cloudpaks/cp4i/install-apic/Chart.yaml | 4 +- .../templates/0050-catalog-source-apic.yaml | 17 +++++++++ .../templates/0100-subscription-apic.yaml | 4 +- .../templates/0200-api-connect.yaml | 17 +++++++-- .../templates/0300-node-imagestream.yaml | 22 ----------- ...310-mq-dev-patterns-node-build-config.yaml | 37 ------------------- .../0310-mq-dev-patterns-node-deployment.yaml | 37 ------------------- config/cloudpaks/cp4i/install-mq/Chart.yaml | 4 +- .../templates/0050-catalog-source-mq.yaml | 17 +++++++++ .../templates/0100-subscription-mq.yaml | 4 +- .../templates/0210-queue-manager.yaml | 4 +- .../cp4i/install-platform/Chart.yaml | 4 +- ...050-catalog-source-platform-navigator.yaml | 17 +++++++++ .../0100-subscription-platform-navigator.yaml | 4 +- .../templates/0200-platform-navigator.yaml | 9 ++--- .../0100-subscription-common-services.yaml | 15 ++++++++ tests/postbuild/cluster.sh | 2 +- 20 files changed, 131 insertions(+), 122 deletions(-) create mode 100644 config/cloudpaks/cp-shared/operators/templates/0050-catalog-source-foundation-services.yaml create mode 100644 config/cloudpaks/cp4i/install-apic/templates/0050-catalog-source-apic.yaml delete mode 100644 config/cloudpaks/cp4i/install-client/templates/0300-node-imagestream.yaml delete mode 100644 config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-build-config.yaml delete mode 100644 config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-deployment.yaml create mode 100644 config/cloudpaks/cp4i/install-mq/templates/0050-catalog-source-mq.yaml create mode 100644 config/cloudpaks/cp4i/install-platform/templates/0050-catalog-source-platform-navigator.yaml create mode 100644 config/cloudpaks/cp4i/install-prereqs/templates/0100-subscription-common-services.yaml diff --git a/README.md b/README.md index 85c7fd44..74376d2a 100644 --- 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/cp4i/Chart.yaml b/config/argocd-cloudpaks/cp4i/Chart.yaml index 5d266540..66eae39e 100644 --- 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.9.1 # 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/cp-shared/operators/templates/0050-catalog-source-foundation-services.yaml b/config/cloudpaks/cp-shared/operators/templates/0050-catalog-source-foundation-services.yaml new file mode 100644 index 00000000..d3fc0d81 --- /dev/null +++ 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 index f5148658..76c8a5ba 100644 --- 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 new file mode 100644 index 00000000..87e2c1b9 --- /dev/null +++ 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 index 29054aff..ff0e68ff 100644 --- 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 index 6276bd5c..4c3b438b 100644 --- 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 deleted file mode 100644 index f34f12c7..00000000 --- a/config/cloudpaks/cp4i/install-client/templates/0300-node-imagestream.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - creationTimestamp: null - annotations: - argocd.argoproj.io/sync-wave: "300" - name: node - namespace: dev -spec: - lookupPolicy: - local: false - tags: - - name: 12-slim - annotations: - openshift.io/imported-from: node:12-slim - from: - kind: DockerImage - name: node:12-slim - importPolicy: {} - referencePolicy: - type: Source 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 deleted file mode 100644 index e123cbd7..00000000 --- a/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-build-config.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -apiVersion: build.openshift.io/v1 -kind: BuildConfig -metadata: - creationTimestamp: null - annotations: - argocd.argoproj.io/sync-wave: "310" - name: mq-dev-patterns-node - namespace: dev -spec: - runPolicy: Serial - triggers: - - type: "GitHub" - github: - secret: "secret101" - - type: "Generic" - generic: - secret: "secret101" - - type: "ImageChange" - source: - contextDir: Node.js - git: - uri: https://github.com/nastacio/mq-dev-patterns.git - type: Git - strategy: - dockerStrategy: - from: - kind: ImageStreamTag - name: node:12-slim - type: Docker - output: - to: - kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-node:latest - postCommit: {} - failedBuildsHistoryLimit: 5 - successfulBuildsHistoryLimit: 5 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 deleted file mode 100644 index 94c47387..00000000 --- a/config/cloudpaks/cp4i/install-client/templates/0310-mq-dev-patterns-node-deployment.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: mq-dev-patterns-node - app.kubernetes.io/part-of: app-mq-dev-patterns - annotations: - argocd.argoproj.io/sync-wave: "310" - name: mq-dev-patterns-node - namespace: dev -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: mq-dev-patterns-node - app.kubernetes.io/part-of: app-mq-dev-patterns - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: mq-dev-patterns-node - app.kubernetes.io/part-of: app-mq-dev-patterns - spec: - containers: - - env: - - name: SERVICE_BINDING_ROOT - value: /config - image: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-node:latest - imagePullPolicy: Always - name: mq-dev-patterns-node - ports: - - containerPort: 8080 - resources: {} - serviceAccountName: default diff --git a/config/cloudpaks/cp4i/install-mq/Chart.yaml b/config/cloudpaks/cp4i/install-mq/Chart.yaml index b7d9851b..2b1e083b 100644 --- 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 new file mode 100644 index 00000000..02f752b7 --- /dev/null +++ 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 index eb4af841..a400b319 100644 --- 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 index f4a1b5e4..7518ddb1 100644 --- 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 index 2175eadf..06a7b68f 100644 --- 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 new file mode 100644 index 00000000..0b79fe16 --- /dev/null +++ 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 diff --git a/config/cloudpaks/cp4i/install-platform/templates/0100-subscription-platform-navigator.yaml b/config/cloudpaks/cp4i/install-platform/templates/0100-subscription-platform-navigator.yaml index c9b15b39..632b2082 100644 --- a/config/cloudpaks/cp4i/install-platform/templates/0100-subscription-platform-navigator.yaml +++ b/config/cloudpaks/cp4i/install-platform/templates/0100-subscription-platform-navigator.yaml @@ -8,8 +8,8 @@ metadata: name: ibm-integration-platform-navigator namespace: {{.Values.metadata.argocd_app_namespace}} spec: - channel: v7.1 + channel: v7.2 installPlanApproval: Automatic name: ibm-integration-platform-navigator - source: ibm-operator-catalog + source: ibm-integration-platform-navigator-catalog sourceNamespace: openshift-marketplace diff --git a/config/cloudpaks/cp4i/install-platform/templates/0200-platform-navigator.yaml b/config/cloudpaks/cp4i/install-platform/templates/0200-platform-navigator.yaml index f3c3b3e1..b03a4455 100644 --- a/config/cloudpaks/cp4i/install-platform/templates/0200-platform-navigator.yaml +++ b/config/cloudpaks/cp4i/install-platform/templates/0200-platform-navigator.yaml @@ -6,15 +6,14 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: "200" + labels: + backup.integration.ibm.com/component: platformnavigator name: integration-navigator namespace: {{.Values.metadata.argocd_app_namespace}} spec: license: accept: true # https://ibm.biz/integration-licenses - license: L-YBXJ-ADJNSM - mqDashboard: true + license: L-VTPK-22YZPK replicas: 1 - storage: - class: {{.Values.storageclass.rwx}} - version: 2023.2.1 + version: 2023.4.1 diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0100-subscription-common-services.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0100-subscription-common-services.yaml new file mode 100644 index 00000000..0e380341 --- /dev/null +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0100-subscription-common-services.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + annotations: + argocd.argoproj.io/sync-wave: "100" + name: ibm-common-service-operator + namespace: "{{.Values.metadata.argocd_app_namespace}}" +spec: + channel: v4.3 + installPlanApproval: Automatic + name: ibm-common-service-operator + source: opencloud-operators + sourceNamespace: openshift-marketplace + startingCSV: ibm-common-service-operator.v4.3.0 diff --git a/tests/postbuild/cluster.sh b/tests/postbuild/cluster.sh index ac1cef46..4c45becc 100755 --- a/tests/postbuild/cluster.sh +++ b/tests/postbuild/cluster.sh @@ -17,7 +17,7 @@ oc_cmd=$(type -p oc) : "${NEW_CLUSTER_TYPE:=fyre-quick-burn}" : "${WORKER_FLAVOR:=medium}" -: "${OCP_VERSION:=4.12}" +: "${OCP_VERSION:=4.14}" # In hours : "${CLUSTER_EXPIRATION:=12}"