[minor] support October 4th catalog with 8.11.1 and SLS 3.8.1 (#1034)

Co-authored-by: Sanjay Prabhakar <sanjay.prabhakar@uk.ibm.com>
ibm-mas · Oct 6, 2023 · 5b70f23 · 5b70f23
1 parent a47a0c4
commit 5b70f23
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 22 deletions.
diff --git a/docs/playbooks/oneclick-update.md b/docs/playbooks/oneclick-update.md
@@ -35,7 +35,7 @@ Usage
 Only one parameter is required, the new tag of the IBM Maximo Operator Catalog that you wish to use:
 
 ```bash
-export MAS_CATALOG_VERSION=v8-230926-amd64
+export MAS_CATALOG_VERSION=v8-231004-amd64
 oc login --token=xxxx --server=https://myocpserver
 ansible-playbook ibm.mas_devops.oneclick_update
 ```

diff --git a/ibm/mas_devops/common_vars/casebundles/v8-231004-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v8-231004-amd64.yml
@@ -0,0 +1,78 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog v230926
+# -----------------------------------------------------------------------------
+# 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:57dfc24fe5c87a0304b4fb9c283a9b0b753e41acfffe61ffac5ca1359a579bdf
+
+# Dependencies
+# -----------------------------------------------------------------------------
+common_svcs_version: 1.19.4                  # Operator version 3.23.4 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
+db2u_version: 5.1.4                          # Operator version 110508.0.2 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
+events_version: 4.6.1                        # Operator version 4.6.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
+uds_version: 2.0.11                          # Operator version 2.0.11
+sls_version: 3.8.1                           # Operator version 3.8.1
+tsm_version: 1.5.1                           # Operator version 1.5.1
+dd_version: 1.1.5                            # Operator version 1.1.5
+appconnect_version: 6.2.0                    # Operator version 6.2.0
+cp4d_platform_version: 2.9.0+20230524.165553 # Operator version 3.8.0
+wsl_version: 6.5.0                           # Operator version 6.5.0
+wml_version: 6.5.0                           # Operator version 3.5.0
+spark_version: 6.5.0                         # Operator version 3.5.0
+
+# Watson discovery and its dependencies
+# Match corresponding case version for default versions in the catalog source
+# -----------------------------------------------------------------------------
+wd_version: 5.5.0                            # Operator version 4.6.5
+model_train_version: 1.2.7                   # Operator version 1.1.9
+elasticsearch_version: 1.1.1541              # Operator version 1.1.1541
+couchdb_version: 1.0.13                      # Operator version 2.2.1
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  8.10.x: 8.10.5  # No Update
+  8.11.x: 8.11.1  # Updated
+mas_assist_version:
+  8.10.x: 8.7.2   # No Update
+  8.11.x: 8.8.0   # No Update
+mas_hputilities_version:
+  8.10.x: 8.6.2   # No Update
+  8.11.x: ""      # Not Supported
+mas_iot_version:
+  8.10.x: 8.7.4   # No Update
+  8.11.x: 8.8.0   # No Update
+mas_manage_version:
+  8.10.x: 8.6.5   # No Update
+  8.11.x: 8.7.0   # No Update
+mas_monitor_version:
+  8.10.x: 8.10.5  # No Update
+  8.11.x: 8.11.0  # No Update
+mas_optimizer_version:
+  8.10.x: 8.4.1   # No Update
+  8.11.x: 8.5.0   # No Update
+mas_predict_version:
+  8.10.x: 8.8.2   # No Update
+  8.11.x: 8.9.0   # No Update
+mas_visualinspection_version:
+  8.10.x: 8.8.1   # No Update
+  8.11.x: 8.9.0   # No Update
+
+# Extra Images for UDS
+# ------------------------------------------------------------------------------
+uds_extras_version: 1.4.0
+
+# Extra Images for Mongo
+# ------------------------------------------------------------------------------
+mongo_extras_version: 4.4.21
+
+# Extra Images for Db2u
+# ------------------------------------------------------------------------------
+db2u_extras_version: 1.0.2
+
+# Extra Images for IBM Watson Discovery
+# ------------------------------------------------------------------------------
+wd_extras_version: 1.0.1
diff --git a/ibm/mas_devops/playbooks/mirror_add_assist.yml b/ibm/mas_devops/playbooks/mirror_add_assist.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_hputilities.yml b/ibm/mas_devops/playbooks/mirror_add_hputilities.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_iot.yml b/ibm/mas_devops/playbooks/mirror_add_iot.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_manage.yml b/ibm/mas_devops/playbooks/mirror_add_manage.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_monitor.yml b/ibm/mas_devops/playbooks/mirror_add_monitor.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_optimizer.yml b/ibm/mas_devops/playbooks/mirror_add_optimizer.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_predict.yml b/ibm/mas_devops/playbooks/mirror_add_predict.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml b/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml
@@ -9,7 +9,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -21,7 +21,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_core.yml b/ibm/mas_devops/playbooks/mirror_core.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
@@ -15,7 +15,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/mirror_dependencies.yml b/ibm/mas_devops/playbooks/mirror_dependencies.yml
@@ -3,7 +3,7 @@
   any_errors_fatal: true
 
   vars:
-    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}"
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-231004-amd64', True) }}"
     mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}"
 
     # 1. Catalog
@@ -66,7 +66,7 @@
 
     - name: "Debug stats if the digest image map file exists"
       ansible.builtin.set_fact:
-        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}"
+        file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-231004-amd64') }}"
 
     - name: Load CASE bundle versions
       include_vars:

diff --git a/ibm/mas_devops/playbooks/oneclick_update.yml b/ibm/mas_devops/playbooks/oneclick_update.yml
@@ -5,7 +5,7 @@
     - name: Check for required environment variables
       assert:
         that: lookup('env', 'MAS_CATALOG_VERSION') != ""
-        fail_msg: "You must provide the catalog version to update to (e.g. 'v8-230829-amd64', 'v8-230926-amd64')"
+        fail_msg: "You must provide the catalog version to update to (e.g. 'v8-230829-amd64', 'v8-231004-amd64')"
 
   roles:
     - ibm.mas_devops.ibm_catalogs