From eefa5c3207847405b323718bdb89ff9e1ebd9775 Mon Sep 17 00:00:00 2001 From: Denilson Nastacio Date: Thu, 1 Feb 2024 15:30:14 -0500 Subject: [PATCH] feat: Upgrade CP4BA to 23.0.2 Signed-off-by: Denilson Nastacio --- README.md | 2 +- .../cloudpaks/cp-shared/operators/Chart.yaml | 4 +- .../0050-sync-cluster-scoped-operators.yaml | 69 ++++++++- .../cloudpaks/cp-shared/operators/values.yaml | 3 + config/cloudpaks/cp4a/operators/Chart.yaml | 2 +- .../templates/0000-catalog-sources.yaml | 144 ++++++++++++++++++ .../templates/0110-base-operator.yaml | 2 +- config/cloudpaks/cp4a/resources/Chart.yaml | 4 +- .../templates/0201-icp4a-cluster.yaml | 4 +- config/cloudpaks/cp4a/resources/values.yaml | 1 + 10 files changed, 225 insertions(+), 10 deletions(-) create mode 100644 config/cloudpaks/cp4a/operators/templates/0000-catalog-sources.yaml diff --git a/README.md b/README.md index b738cf6f..45c1cad2 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Supported versions: | Cloud Pak | Version | Installation mode | | ----------|---------|-------------------| -| 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 Business Automation | [23.0.2](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/23.0.2) | Multi-pattern starter deployment | | Cloud Pak for Data | [4.8.2](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=overview) | Online, specialized 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 | diff --git a/config/cloudpaks/cp-shared/operators/Chart.yaml b/config/cloudpaks/cp-shared/operators/Chart.yaml index c85bfa70..9869aafa 100644 --- a/config/cloudpaks/cp-shared/operators/Chart.yaml +++ b/config/cloudpaks/cp-shared/operators/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.6.2 +version: 0.6.3 # 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: "1.2.1" +appVersion: "1.2.2" diff --git a/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml b/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml index 1bfec487..81aa2867 100644 --- a/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml +++ b/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml @@ -25,6 +25,12 @@ spec: value: {{.Values.metadata.ibm_cert_manager_operator_group}} - name: IBM_CERT_MANAGER_CHANNEL value: {{.Values.metadata.ibm_cert_manager_channel}} + - name: IBM_LICENSE_MANAGER_NAMESPACE + value: {{.Values.metadata.ibm_license_manager_namespace}} + - name: IBM_LICENSE_MANAGER_OPERATOR_GROUP + value: {{.Values.metadata.ibm_license_manager_operator_group}} + - name: IBM_LICENSE_MANAGER_CHANNEL + value: {{.Values.metadata.ibm_license_manager_channel}} command: - /bin/sh - -c @@ -90,13 +96,74 @@ spec: -A fi else - echo "ERROR: Unable to ascertain status of cert managers in the cluster." + echo "ERROR: Unable to get status of cert managers in the cluster." fi if [ "${result}" -eq 1 ] ; then echo "ERROR: Unable to locate a running IBM Cert Manager and to install one afterwards." fi + ibm_license_manager_count=$(oc get Subscription.operators.coreos.com \ + -l operators.coreos.com/ibm-cert-manager-operator.ibm-cert-manager \ + -A \ + -o name | wc -l || result=1) + if [ "${result}" == 0 ]; then + if [ "${ibm_license_manager_count}" == "0" ]; then + echo "INFO: Installing IBM Cert Manager." + cat << EOF | oc apply -f - + --- + kind: Namespace + apiVersion: v1 + metadata: + name: ${IBM_LICENSE_MANAGER_NAMESPACE:?} + --- + apiVersion: operators.coreos.com/v1 + kind: OperatorGroup + metadata: + name: ibm-licensing-operator-app + namespace: ${IBM_LICENSE_MANAGER_NAMESPACE:?} + spec: + targetNamespaces: + - ${IBM_LICENSE_MANAGER_NAMESPACE:?} + --- + apiVersion: operators.coreos.com/v1alpha1 + kind: Subscription + metadata: + name: ibm-licensing-operator-app + namespace: ${IBM_LICENSE_MANAGER_NAMESPACE:?} + spec: + channel: v4.2 + installPlanApproval: Automatic + name: ibm-licensing-operator-app + source: ibm-licensing-catalog + sourceNamespace: openshift-marketplace + EOF + + while [ $SECONDS -lt 300 ]; do + oc wait Subscription.operators.coreos.com ibm-licensing-operator-app \ + -n ${IBM_LICENSE_MANAGER_NAMESPACE:?} \ + --for=condition=CatalogSourcesUnhealthy=False \ + && oc wait Subscription.operators.coreos.com ibm-licensing-operator-app \ + -n ${IBM_LICENSE_MANAGER_NAMESPACE:?} \ + --for=jsonpath='{.status.state}'="AtLatestKnown" \ + && echo "INFO: Successfully installed IBM License Manager." \ + && result=0 \ + && break \ + || result=1 + + echo "INFO: Waiting for the subscription to be ready." + sleep 20 + done + else + echo "INFO: IBM License Manager already installed." + oc get Subscription.operators.coreos.com \ + -l operators.coreos.com/ibm-licensing-operator-app.ibm-licensing \ + -A + fi + else + echo "ERROR: Unable to get status of cert managers in the cluster." + fi + exit "${result}" restartPolicy: Never diff --git a/config/cloudpaks/cp-shared/operators/values.yaml b/config/cloudpaks/cp-shared/operators/values.yaml index e5f746c7..75212c0f 100644 --- a/config/cloudpaks/cp-shared/operators/values.yaml +++ b/config/cloudpaks/cp-shared/operators/values.yaml @@ -5,6 +5,9 @@ metadata: ibm_cert_manager_channel: v4.2 ibm_cert_manager_namespace: ibm-cert-manager ibm_cert_manager_operator_group: ibm-cert-manager-operator-group + ibm_license_manager_channel: v4.2 + ibm_license_manager_namespace: ibm-licensing + ibm_license_manager_operator_group: ibm-licensing-operator-app redhat_cert_manager_namespace: cert-manager-operator redhat_cert_manager_operator_group: cert-manager-operator-group serviceaccount: diff --git a/config/cloudpaks/cp4a/operators/Chart.yaml b/config/cloudpaks/cp4a/operators/Chart.yaml index d572e822..34e29a09 100644 --- a/config/cloudpaks/cp4a/operators/Chart.yaml +++ b/config/cloudpaks/cp4a/operators/Chart.yaml @@ -21,4 +21,4 @@ version: 0.7.2 # 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: "23.0.1" +appVersion: "23.0.2" diff --git a/config/cloudpaks/cp4a/operators/templates/0000-catalog-sources.yaml b/config/cloudpaks/cp4a/operators/templates/0000-catalog-sources.yaml new file mode 100644 index 00000000..f4605ecf --- /dev/null +++ b/config/cloudpaks/cp4a/operators/templates/0000-catalog-sources.yaml @@ -0,0 +1,144 @@ +# CP4BA 23.0.2 catalog +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-cp4a-operator-catalog + namespace: openshift-marketplace +spec: + displayName: ibm-cp4a-operator + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-cp-automation-catalog@sha256:14a5064116fcc69b64336888a61578054bcadbdaa73fb9ab8e5002070713875a + updateStrategy: + registryPoll: + interval: 45m +--- +# IBM CS Flink Operator Catalog 1.3.14 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-cs-flink-operator-catalog + namespace: openshift-marketplace +spec: + displayName: IBM CS Flink Operator + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-cs-flink-operator-catalog@sha256:732e3afb4c43bb3367175c0e2d4461faed9a29eb1ba47c63875efdcb7d6ae54f + updateStrategy: + registryPoll: + interval: 45m + priority: 100 +--- +# IBM CS Elastic Operator Catalog 1.3.14 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-cs-elastic-operator-catalog + namespace: openshift-marketplace +spec: + displayName: IBM CS Elastic Search Operator + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-cs-elastic-operator-catalog@sha256:a41ad89177f39a200f666310d7505848c7953965db08017a97781c5d51f78642 + updateStrategy: + registryPoll: + interval: 45m + priority: 100 +--- +# IBM Certificate Manager 4.2 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-cert-manager-catalog + namespace: openshift-marketplace +spec: + displayName: ibm-cert-manager-4.2.0 + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-cert-manager-operator-catalog@sha256:95da3736d298d2ac824afd8587b98728e48b0e7270b9304f4e3c76b65f9b8b98 + updateStrategy: + registryPoll: + interval: 45m +--- +# IBM License Manager 4.2 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-licensing-catalog + namespace: openshift-marketplace +spec: + displayName: ibm-licensing-4.2.0 + publisher: IBM + image: icr.io/cpopen/ibm-licensing-catalog@sha256:210a452d30aa6f996fee80fb35fea0ca7d709fe3c589fb6eaa79ceb0b24a6a4c + sourceType: grpc + updateStrategy: + registryPoll: + interval: 45m +--- +# IBM Cloud Foundational Services 4.2 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: opencloud-operators-v4-2 + namespace: openshift-marketplace + annotations: + bedrock_catalogsource_priority: '1' +spec: + displayName: IBMCS Operators + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-common-service-catalog@sha256:ef9b76c30ff282d720f9d502a7001164a3f5c62f91843eb56d11da87abea6c1e + updateStrategy: + registryPoll: + interval: 45m + priority: 100 +--- +# IBM Business Teams Service version 3.31.0 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: bts-operator + namespace: openshift-marketplace + annotations: + bedrock_catalogsource_priority: '1' +spec: + displayName: BTS Operator + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-bts-operator-catalog@sha256:7f9c0a46f589d0e528d894ba9aba5875b208b4c7dfd08a9c040e76a7be61f8d4 + updateStrategy: + registryPoll: + interval: 45m +--- +# Cloud Native PostgresSQL 4.14.0+20230614.093000 +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: cloud-native-postgresql-catalog + namespace: openshift-marketplace + annotations: + bedrock_catalogsource_priority: '1' +spec: + displayName: Cloud Native Postgresql Catalog + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-cpd-cloud-native-postgresql-operator-catalog@sha256:e1f1fcecd58a944d6bb881d62e9d1c5f13cd39d7afdb02533ab64adc85b31d06 + updateStrategy: + registryPoll: + interval: 45m + priority: 100 +--- +# IBM FileNet Content Manager Standalone catalog. +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-fncm-operator-catalog + namespace: openshift-marketplace +spec: + displayName: ibm-fncm-operator + publisher: IBM + sourceType: grpc + image: icr.io/cpopen/ibm-fncm-catalog@sha256:0ecc62f5e9eec5d1e0e58fd510fbb7110a1a175aa834ade2059c170792393863 + updateStrategy: + registryPoll: + interval: 45m diff --git a/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml b/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml index 5709dce4..6fa42595 100644 --- a/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml +++ b/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml @@ -8,7 +8,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "110" spec: - channel: v23.1 + channel: v23.2 installPlanApproval: Automatic name: ibm-cp4a-operator source: ibm-operator-catalog diff --git a/config/cloudpaks/cp4a/resources/Chart.yaml b/config/cloudpaks/cp4a/resources/Chart.yaml index d2be637d..59e4d91e 100644 --- a/config/cloudpaks/cp4a/resources/Chart.yaml +++ b/config/cloudpaks/cp4a/resources/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.7.0 +version: 0.7.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: "23.0.1" +appVersion: "23.0.2" diff --git a/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml b/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml index b901002b..50609ad3 100644 --- a/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml +++ b/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml @@ -11,7 +11,7 @@ metadata: argocd.argoproj.io/sync-wave: "201" namespace: {{.Values.argocd_app_namespace}} spec: - appVersion: 23.0.1 + appVersion: 23.0.2 olm_deployment_type: Starter olm_ibm_license: true olm_starter_application: true @@ -320,7 +320,7 @@ spec: sc_deployment_fncm_license: non-production sc_deployment_license: non-production sc_deployment_platform: {{.Values.spec.shared_configuration.sc_deployment_platform}} - sc_deployment_profile_size: '' + sc_deployment_profile_size: {{.Values.spec.shared_configuration.sc_deployment_profile_size}} sc_drivers_url: '' sc_ingress_enable: false sc_ingress_tls_secret_name: '' diff --git a/config/cloudpaks/cp4a/resources/values.yaml b/config/cloudpaks/cp4a/resources/values.yaml index f19dc55b..e012559b 100644 --- a/config/cloudpaks/cp4a/resources/values.yaml +++ b/config/cloudpaks/cp4a/resources/values.yaml @@ -6,6 +6,7 @@ metadata: spec: shared_configuration: sc_deployment_platform: OCP + sc_deployment_profile_size: starter storageclass: block: ocs-storagecluster-ceph-rbd gold: ocs-storagecluster-cephfs