24.0.1

airgap/ADS-case-list.yaml

@@ -1,23 +1,19 @@
 name: ibm-ads
-version: 1.3.3
-description: List of CASEs required for air gapped deployment of ADS 24.0.0-IF003
+version: 1.4.0
+description: List of CASEs required for air gapped deployment of ADS 24.0.1
 cases:
 - name: ibm-ads
-  version: 1.3.3
+  version: 1.4.0
   launch: true
-- name: ibm-cp-common-services
-  version: 4.6.2
 - name: ibm-cloud-native-postgresql
-  version: 4.25.0
+  version: 4.29.0+20240829.203322.1920
 - name: ibm-cs-iam
-  version: 4.5.1
+  version: 4.8.0
 - name: ibm-cs-install
-  version: 4.6.2
-- name: ibm-events-operator
-  version: 5.0.1
+  version: 4.9.0
 - name: ibm-zen
-  version: 3.1.4
+  version: 6.0.4+20240916.202115.96
 - name: ibm-cert-manager
-  version: 4.2.4
+  version: 4.2.8
 - name: ibm-licensing
-  version: 4.2.4
+  version: 4.2.8

scripts/constants.sh

@@ -3,28 +3,30 @@
 olm_minimal_version=v0.23.1
 olm_version=v0.27.0
 
-ads_channel_previous_version=v23.2
+ads_channel_previous_version=v24.0
 
 licensing_service_channel=v4.2
-licensing_service_target_version="4.2.2"
+licensing_service_target_version="4.2.8"
 cert_manager_channel=v4.2
-cert_manager_target_version="4.2.2"
-ads_channel=v24.0
-common_services_version=4.6.2 # Common Service version to install
+cert_manager_target_version="4.2.8"
+ads_channel=v24.1
+common_services_version=4.9.0 # Common Service version to install
 
 licensing_service_minimal_version_for_upgrade="4.2.0"
 cert_manager_minimal_version_for_upgrade="4.2.0"
 
-cs_minimal_version_for_upgrade="4.2.0" # Minimal supported Common Service version before upgrading from 23.0.2
-cs_maximal_version_for_upgrade="5.0.0" # Maximal supported Common Service version before upgrading from 23.0.2
+cs_minimal_version_for_upgrade="4.6.2" # Minimal supported Common Service version before upgrading from 24.0.0
+cs_maximal_version_for_upgrade="5.0.0" # Maximal supported Common Service version before upgrading from 24.0.0
 
 cs_minimal_version_for_ifix="4.6.2" # Minimal supported Common Service version before upgrading for ifix
 cs_maximal_version_for_ifix="5.0.0" # Maximal supported Common Service version before upgrading for ifix
 
-licensing_catalog_image="icr.io/cpopen/ibm-licensing-catalog@sha256:dfdd38cac150cd354853ac88d02396a9457d22964f898d10126b4a880b4d0916" # IBM License Manager 4.2.2 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing/4.2.2
-cert_manager_catalog_image="icr.io/cpopen/ibm-cert-manager-operator-catalog@sha256:955732299dd174524612ec8e8076237a491cedee1264e4e4be39c2a92f48bc39" # IBM Certificate Manager 4.2.2 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cert-manager/4.2.2
+licensing_catalog_image="icr.io/cpopen/ibm-licensing-catalog@sha256:a4c1121894a0fadd0f62415fdfe381bd92ac8afb9314539c8770c88c006ebd42" # IBM License Manager 4.2.8 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing/4.2.8
+cert_manager_catalog_image="icr.io/cpopen/ibm-cert-manager-operator-catalog@sha256:6268cedf6759cf544560d9f652974c14f293858c53bf747b145b4522d39701bb" # IBM Certificate Manager 4.2.8 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cert-manager/4.2.8
 
-cs_catalog_image="icr.io/cpopen/ibm-common-service-catalog@sha256:601e84bf15e92a98e2b9a6e64320a2cd4f4912533bf49407eed4aeacca8d0c00" # IBM Cloud Foundational Services 4.6.2 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services/4.6.2
-ads_catalog_image="icr.io/cpopen/ibm-ads-operator-catalog@sha256:4990604c8d691e163b27c14af3f33f410e43941dddde34961e3b42db04cf6c0f" # 24.0.0-IF003
-edb_catalog_image="icr.io/cpopen/ibm-cpd-cloud-native-postgresql-operator-catalog@sha256:c96aa2e6bce92f2e5e4874116cf1cc1cdd60676499cd04ab1631462b8b883357" # Cloud Native PostgresSQL 4.18.0 from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cloud-native-postgresql/4.18.0
+cs_catalog_image="icr.io/cpopen/ibm-cs-install-catalog@sha256:6dec61b65e1414fadce180ce9e9aeba82dd2e393085cb3cadc1a6e271cefe50a" # IBM Cloud Foundational Services 4.9.0 from https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-cs-install/4.9.0/OLM/catalog-sources.yaml
+cs_im_catalog_image="icr.io/cpopen/ibm-iam-operator-catalog@sha256:28685c8ebc72df046e883ca37c379ea11b4e6e14c9dd7c8da2c91b3cf1b57816" # IBM CS IM Operator Catalog 4.8.0
+zen_catalog_image="icr.io/cpopen/ibm-zen-operator-catalog@sha256:9ce549fe51c21f584ad1e37fb09f0931018b48e4081af43bdff85d8dedfa8d65" # IBM Zen Operator Catalog 6.0.4+20240916.202115.96
+ads_catalog_image="icr.io/cpopen/ibm-ads-operator-catalog@sha256:0656cc7ba5b6ccab1a82f3bfb989df73a04c2ce1849e232fcb5fa2f215e77b91" # 24.0.1
+edb_catalog_image="icr.io/cpopen/ibm-cpd-cloud-native-postgresql-operator-catalog@sha256:d6b5e43f3b5c4e4198ed6ddfd4577eebea644df9d2fe2bac33600764b5cda631" # Cloud Native PostgresSQL 1.22.5 (CASE 4.29.0+20240829.203322.1920) from https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cloud-native-postgresql/4.29.0%2B20240829.203322.1920
 

scripts/utils.sh

@@ -250,7 +250,10 @@ function create_ads_catalog_sources() {
   # Only create common services catalog if installed version is lower than the version in catalog referenced by cs_catalog_image variable
   local vcs=$(get_common_service_version ${ads_namespace})
   if [[ "$vcs" == "unknown" || $(semver_compare ${vcs} ${common_services_version}) == "-1" ]]; then
-      create_catalog_source opencloud-operators "IBMCS Operators" ${cs_catalog_image} ${ads_namespace} ${is_openshift}
+      create_catalog_source opencloud-operators "IBM CS Install Operators" ${cs_catalog_image} ${ads_namespace} ${is_openshift}
+      create_catalog_source ibm-cs-im-operators "IBM IAM Operator Catalog" ${cs_im_catalog_image} ${ads_namespace} ${is_openshift}
+      create_catalog_source ibm-zen-operators "IBM Zen Operator Catalog" ${zen_catalog_image} ${ads_namespace} ${is_openshift}
+
   fi
 
   create_catalog_source cloud-native-postgresql-catalog "Cloud Native Postgresql Catalog" ${edb_catalog_image} ${ads_namespace} ${is_openshift}
@@ -367,6 +370,15 @@ function upgrade_ads_subscription() {
     sub=$(kubectl get sub -n ${ads_namespace} | grep ibm-common-service-operator | cut -d ' ' -f 1)
     kubectl delete sub ${sub} -n ${ads_namespace}
 
+    sub=$(kubectl get sub -n ${ads_namespace} | grep ibm-im-operator | cut -d ' ' -f 1)
+    kubectl delete sub ${sub} -n ${ads_namespace}
+
+    sub=$(kubectl get sub -n ${ads_namespace} | grep ibm-idp-config-ui-operator | cut -d ' ' -f 1)
+    kubectl delete sub ${sub} -n ${ads_namespace}
+
+    sub=$(kubectl get sub -n ${ads_namespace} | grep ibm-platformui-operator | cut -d ' ' -f 1)
+    kubectl delete sub ${sub} -n ${ads_namespace}
+
     sub=$(kubectl get sub -n ${ads_namespace} | grep operand-deployment-lifecycle-manager | cut -d ' ' -f 1)
     kubectl delete sub ${sub} -n ${ads_namespace}
 
@@ -376,6 +388,15 @@ function upgrade_ads_subscription() {
     csv=$(kubectl get csv -n ${ads_namespace} | grep ibm-common-service-operator | cut -d ' ' -f 1)
     kubectl delete csv ${csv} -n ${ads_namespace}
 
+    csv=$(kubectl get csv -n ${ads_namespace} | grep ibm-commonui-operator | cut -d ' ' -f 1)
+    kubectl delete csv ${csv} -n ${ads_namespace}
+
+    csv=$(kubectl get csv -n ${ads_namespace} | grep ibm-iam-operator | cut -d ' ' -f 1)
+    kubectl delete csv ${csv} -n ${ads_namespace}
+
+    csv=$(kubectl get csv -n ${ads_namespace} | grep ibm-zen-operator | cut -d ' ' -f 1)
+    kubectl delete csv ${csv} -n ${ads_namespace}
+
     csv=$(kubectl get csv -n ${ads_namespace} | grep operand-deployment-lifecycle-manager | cut -d ' ' -f 1)
     kubectl delete csv ${csv} -n ${ads_namespace}