change serverless to servicemesh for mas

Author: IanBoden

ibm/mas_devops/playbooks/mirror_dependencies.yml

@@ -70,6 +70,11 @@
     # -------------------------------------------------------------------------
     mirror_kmodels: "{{ lookup('env', 'MIRROR_KMODELS') | default ('False', True) | bool }}"
 
+    # 15. Minio and MariaDB (for AI Service)
+    mirror_minio: "{{ lookup('env', 'MIRROR_MINIO') | default ('False', True) | bool }}"
+    mirror_mariadb: "{{ lookup('env', 'MIRROR_MARIADB') | default ('False', True) | bool }}"
+    mirror_opendatahub: "{{ lookup('env', 'MIRROR_OPENDATAHUB') | default ('True', True) | bool }}"
+
   pre_tasks:
     - name: "Load Catalog Metadata"
       ibm.mas_devops.get_catalog_info:
@@ -623,3 +628,34 @@
       vars:
         manifest_name: extras_kmodels
         manifest_version: "{{ mas_catalog_metadata.kmodels_extras_version_default }}"
+
+    # 15. Minio and opendatahub - needed by AI Service
+    # -------------------------------------------------------------------------
+    - role: ibm.mas_devops.mirror_extras_prepare
+      when:
+        - mirror_minio
+        - mirror_mode != "from-filesystem"
+      vars:
+        extras_name: minio
+        extras_version: "{{mas_catalog_metadata.minio_version }}"
+
+    - role: ibm.mas_devops.mirror_images
+      when: mirror_minio
+      vars:
+        manifest_name: extras_minio
+        manifest_version: "{{mas_catalog_metadata.minio_version }}"
+
+    - role: ibm.mas_devops.mirror_extras_prepare
+      when:
+        - mirror_opendatahub
+        - mirror_mode != "from-filesystem"
+      vars:
+        extras_name: "opendatahub"
+        extras_version: "2.32"
+
+    - role: ibm.mas_devops.mirror_images
+      when: mirror_opendatahub
+      vars:
+        manifest_name: extras_opendatahub
+        manifest_version: "2.32"
+

ibm/mas_devops/playbooks/mirror_openshift.yml

@@ -2,7 +2,14 @@
 - hosts: localhost
   any_errors_fatal: true
 
+  vars:
+    catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('@@MAS_LATEST_CATALOG@@', True) }}"
+
   pre_tasks:
+    - name: "Load Catalog Metadata"
+      ibm.mas_devops.get_catalog_info:
+        mas_catalog_version: "{{ catalog_tag }}"
+      register: mas_catalog_metadata
     - name: Check for required environment variables
       assert:
         that:

ibm/mas_devops/roles/mirror_images/tasks/main.yml

@@ -31,7 +31,6 @@
   ansible.builtin.template:
     src: templates/auth-secret.json.j2
     dest: "{{ auth_file }}"
-  no_log: true
 
 # 3. Modify the manifest
 # -----------------------------------------------------------------------------

ibm/mas_devops/roles/mirror_ocp/templates/imagesetconfiguration.yml.j2

@@ -56,6 +56,12 @@ mirror:
           channels:
             - name: stable
             - name: strimzi-0.45.x
+        - name: mariadb-operator
+          channels:
+            - name: alpha
+        - name: opendatahub-operator
+          channels:
+            - name: fast
 
     # redhat-operators
     - catalog: registry.redhat.io/redhat/redhat-operator-index:v{{ ocp_release }}
@@ -84,9 +90,26 @@ mirror:
         - name: lvms-operator  # Not used by any of our roles, but used in SNO installations
           channels:
             - name: stable-{{ ocp_release }}
+        - name: serverless-operator
+          channels:
+            - name: stable
+        - name: servicemeshoperator
+          channels:
+            - name: stable
+        - name: authorino-operator
+          channels:
+            - name: stable
+        - name: opendatahub
+          channels:
+            - name: stable
 {% if ocp_release >= "4.17" %}
         - name: odf-dependencies  # Required by ibm.mas_devops.ocs role
           channels:
             - name: stable-{{ ocp_release }}
+{% endif %}
+  additionalImages:
+    - name: "registry.redhat.io/openshift-service-mesh/istio-operator-bundle@sha256:deb5e82c55ed09614827736ae7b38fab6b14281cd57929b246479b035cad8ec5"
+{% if mas_catalog_metadata.mariadb_version %}
+    - name: "registry.redhat.io/rhel8/mariadb-103:{{mas_catalog_metadata.mariadb_version}}"
 {% endif %}
 {% endif %}

ibm/mas_devops/roles/ocp_idms/templates/idms/mas/redhat-catalogs.yml.j2

@@ -136,8 +136,8 @@ spec:
     source: registry.redhat.io/openshift-pipelines
     mirrorSourcePolicy: NeverContactSource
   - mirrors:
-    - {{ registry_private_url_with_path_redhat }}/openshift-service-mesh
-    source: registry.redhat.io/openshift-service-mesh
+    - {{ registry_private_url_with_path_redhat }}/openshift-serverless-1
+    source: registry.redhat.io/openshift-serverless-1
     mirrorSourcePolicy: NeverContactSource
   - mirrors:
     - {{ registry_private_url_with_path_redhat }}/turbonomic