[minor] Support November catalog (#1508)

Co-authored-by: Parveen Kumar <parveenkumar@ibm.com> Co-authored-by: Jon Levell <jonquark@users.noreply.github.com> Co-authored-by: Jon Levell <levell@uk.ibm.com> Co-authored-by: Ian Boden <82514609+IanBoden@users.noreply.github.com> Co-authored-by: Ian Boden <ianboden@uk.ibm.com>
ibm-mas · Nov 11, 2024 · 08c22d7 · 08c22d7
1 parent 3501786
commit 08c22d7
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 3 deletions.
diff --git a/build/bin/build-collection.sh b/build/bin/build-collection.sh
@@ -13,8 +13,8 @@ cat $GITHUB_WORKSPACE/ibm/mas_devops/galaxy.yml
 
 
 # Update this when we have new catalog
-MAS_PREVIOUS_CATALOG='v9-240827-amd64'
-MAS_LATEST_CATALOG='v9-241003-amd64'
+MAS_PREVIOUS_CATALOG='v9-241003-amd64'
+MAS_LATEST_CATALOG='v9-241107-amd64'
 
 
 # Update all the placeholders in the playbooks

diff --git a/ibm/mas_devops/common_vars/casebundles/v9-241107-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v9-241107-amd64.yml
@@ -0,0 +1,100 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog 240625
+# -----------------------------------------------------------------------------
+# In the future this won't be necessary as we'll be able to mirror from the
+# catalog itself, but not everything in the catalog supports this yet (including MAS)
+# so we need to use the CASE bundle mirror process still.
+
+catalog_digest: sha256:2d470131ab6948d5262553547fafa1b472fa25690be5abba8719ad7493cd8911
+
+# Dependencies
+# -----------------------------------------------------------------------------
+ibm_licensing_version: 4.2.7                 # Operator version 4.2.7 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
+common_svcs_version: 4.3.0                   # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0   # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
+cp4d_platform_version: 4.0.0+20231213.115030 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030)
+
+db2u_version: 6.0.1+20240704.142950.9960     # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
+events_version: 5.0.1                        # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
+uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
+sls_version: 3.10.1 # Updated              # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
+tsm_version: 1.5.4                           # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
+dd_version: 1.1.12 # No Update                 # Operator version 1.1.11 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
+appconnect_version: 6.2.0                    # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
+wsl_version: 8.0.0                           # Operator version 8.0.0
+wml_version: 8.0.0                           # Operator version 5.0.0
+spark_version: 8.0.0                         # Operator version 5.0.0
+cognos_version: 25.0.0                       # Operator version 25.0.0
+couchdb_version: 1.0.13                      # Operator version 2.2.1 (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
+elasticsearch_version: 1.1.2238              # Operator version 1.1.2238
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  9.0.x: 9.0.5    # Updated
+  8.10.x: 8.10.19 # Updated
+  8.11.x: 8.11.16 # Updated
+mas_assist_version:
+  9.0.x: 9.0.2    # No Update
+  8.10.x: 8.7.7   # No Update
+  8.11.x: 8.8.6   # No Update
+mas_hputilities_version:
+  9.0.x: ""       # Not Supported
+  8.10.x: 8.6.7   # No Update
+  8.11.x: ""      # Not Supported
+mas_iot_version:
+  9.0.x: 9.0.4    # Updated
+  8.10.x: 8.7.18  # Updated
+  8.11.x: 8.8.14  # Updated
+mas_manage_version:
+  9.0.x: 9.0.5    # Updated
+  8.10.x: 8.6.19  # Updated
+  8.11.x: 8.7.13  # Updated
+mas_monitor_version:
+  9.0.x: 9.0.4    # Updated
+  8.10.x: 8.10.14 # No Update
+  8.11.x: 8.11.12 # Updated
+mas_optimizer_version:
+  9.0.x: 9.0.4    # Updated
+  8.10.x: 8.4.11  # Updated
+  8.11.x: 8.5.10   # Updated
+mas_predict_version:
+  9.0.x: 9.0.2    # No Update
+  8.10.x: 8.8.4   # Updated
+  8.11.x: 8.9.5   # No Update
+mas_visualinspection_version:
+  9.0.x: 9.0.4    # Updated
+  8.10.x: 8.8.4   # No update
+  8.11.x: 8.9.7   # Updated
+
+# Extra Images for UDS
+# ------------------------------------------------------------------------------
+uds_extras_version: 1.5.0
+
+# Extra Images for Mongo
+# ------------------------------------------------------------------------------
+mongo_extras_version_default: 7.0.12
+mongo_extras_version: "{{ lookup('env', 'MONGODB_VERSION') | default(mongo_extras_version_default, True) }}"
+
+# Variables used to mirror additional mongo image versions
+mongo_extras_version_4: 4.4.21
+mongo_extras_version_5: 5.0.23
+mongo_extras_version_6: 6.0.12
+mongo_extras_version_7: 7.0.12
+
+# Extra Images for Db2u
+# ------------------------------------------------------------------------------
+db2u_extras_version: 1.0.6
+
+# Extra Images for IBM Watson Discovery
+# ------------------------------------------------------------------------------
+#wd_extras_version: 1.0.4
+
+# Extra Images for Amlen
+# ------------------------------------------------------------------------------
+amlen_extras_version: 1.1.2
+
+# Default Cloud Pak for Data version
+# ------------------------------------------------------------------------------
+cpd_product_version_default: 4.8.0
+cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default(cpd_product_version_default, true) }}"
diff --git a/ibm/mas_devops/playbooks/mirror_dependencies.yml b/ibm/mas_devops/playbooks/mirror_dependencies.yml
@@ -197,6 +197,30 @@
         manifest_name: ibm-cp-common-services
         manifest_version: "{{ common_svcs_version }}"
 
+    - name: ibm.mas_devops.mirror_case_prepare
+      when:
+        - mirror_cp4d
+        - ibm_zen_version is defined
+        - mirror_mode != "from-filesystem"
+      vars:
+        case_name: ibm-zen
+        case_version: "{{ ibm_zen_version }}"
+        exclude_images:
+          - ibm-auditlogging
+          - ibm-cpp
+          - ibm-cs-healthcheck
+          - ibm-cs-monitoring
+          - ibm-events-operator
+        ibmpak_skip_dependencies: false
+
+    - name: ibm.mas_devops.mirror_images
+      when:
+        - mirror_cp4d
+        - ibm_zen_version is defined
+      vars:
+        manifest_name: ibm-zen
+        manifest_version: "{{ ibm_zen_version }}"
+
     # Mirroring another version for Cloud Pak Foundation Services
     - name: ibm.mas_devops.mirror_case_prepare
       when:
@@ -298,7 +322,6 @@
         manifest_name: ibm-cp-datacore
         manifest_version: "{{ cp4d_platform_version }}"
 
-
     # 6.2 CP4D Platform - IBM Licensing dependency
     # -------------------------------------------------------------------------
     - name: ibm.mas_devops.mirror_case_prepare

diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/amlen_1.1.2.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/amlen_1.1.2.yml
@@ -0,0 +1,16 @@
+---
+extra_images:
+  - name: amlen/operator-bundle
+    registry: quay.io
+    digest: sha256:9242f268798e522e5be5035f5f68dba1677560939d7464896fe71e8bc32be612
+    tag: 1.1.2
+
+  - name: amlen/operator
+    registry: quay.io
+    digest: sha256:bba8f0fa2767f2aa3a308e1d045b9dcfd1a87418471de9a59140d14593428d98
+    tag: 1.1.2
+
+  - name: kubebuilder/kube-rbac-proxy
+    registry: gcr.io
+    digest: sha256:0df4ae70e3bd0feffcec8f5cdb428f4abe666b667af991269ec5cb0bbda65869
+    tag: 1.1.2