[patch] Aibroker update playbook for install specific ODH version

ibm/mas_devops/roles/aibroker/tasks/watsonx/install/main.yml

@@ -11,3 +11,9 @@
   script: "{{ role_path }}/files/create_wx.sh {{ tenantNamespace }} {{ aibroker_namespace }} {{ mas_aibroker_watsonxai_apikey }} {{ mas_aibroker_watsonxai_url }} {{ mas_aibroker_watsonxai_project_id }}"
   when:
     - wx_apikey_secret_info.resources | length == 0
+
+# Copy wx secret to tenant namespace
+- name: 'Copy secrets to namespace: {{ tenantNamespace }}'
+  shell: 'oc get secret {{ item }} -n mas-{{ mas_instance_id }}-aibroker -o yaml | sed "s/namespace: .*/namespace: {{ tenantNamespace }}/" | oc apply --force -f -'
+  with_items:
+    - '{{ tenantNamespace }}----wx-secret'

ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/configmap.yml.j2

@@ -11,4 +11,4 @@ data:
   WATCHER_SENDER_DELAY: "5"
   EXCLUDE_JOB_NAMESPACES: "ibm-cpd"
   PIPELINES: mas-{{ mas_instance_id }}-aibroker
-  TENANTS: {{ tenantNamespace }}
+  CONTROLLER_URL: "https://km-controller:8443"

ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/deployment.yml.j2

@@ -62,3 +62,5 @@ spec:
           envFrom:
             - configMapRef:
                 name: km-watcher
+            - secretRef:
+                name: km-s3-secret

ibm/mas_devops/roles/kmodels/vars/main.yml

@@ -2,13 +2,13 @@
 # vars file for kmodels
 pullSecretName: "ibm-entitlement"
 # controller
-mas_aibroker_controller_tag: 1.0.1
+mas_aibroker_controller_tag: 1.0.2
 controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}"
 # store
-mas_aibroker_store_tag: 1.0.1
+mas_aibroker_store_tag: 1.0.2
 store: "aibroker/store:{{ mas_aibroker_store_tag }}"
 # watcher
-mas_aibroker_watcher_tag: 1.0.1
+mas_aibroker_watcher_tag: 1.0.2
 watcher: "aibroker/watcher:{{ mas_aibroker_watcher_tag }}"
 
 mas_aibroker_connector_tag: 1.0.0

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

@@ -53,7 +53,7 @@
     - dsci_lookup.resources[0].status is defined
     - dsci_lookup.resources[0].status.phase is defined
     - dsci_lookup.resources[0].status.phase == 'Ready'
-  retries: 10
+  retries: 20
   delay: 30
 
 # Create Data Science Cluster
@@ -73,7 +73,7 @@
     - dsc_lookup.resources[0].status is defined
     - dsc_lookup.resources[0].status.phase is defined
     - dsc_lookup.resources[0].status.phase == 'Ready'
-  retries: 10
+  retries: 30
   delay: 30
 
 # Create Data Science Pipelines Applications
@@ -93,7 +93,7 @@
     - dspa_lookup.resources is defined
     - dspa_lookup.resources | length > 0
     - dspa_lookup.resources | json_query('[*].status.conditions[?type==`Ready`][].status') | select ('match','True') | list | length == 1
-  retries: 10
+  retries: 20
   delay: 30
 
 # Wait until the pipeline-runner-instance service account is available
@@ -105,7 +105,7 @@
     name: pipeline-runner-instance
     namespace: "{{ aibroker_namespace }}"
   register: pipelinerunner_sa_lookup
-  retries: 10 # Up to 10 minutes
+  retries: 20 # Up to 10 minutes
   delay: 60 # Every 1 minute
   until:
     - pipelinerunner_sa_lookup.resources is defined

ibm/mas_devops/roles/odh/tasks/odh-operator.yml

@@ -1,21 +1,27 @@
 ---
-# Install Operator & create entitlement openshift-odh
-# -----------------------------------------------------------------------------
-- name: "Install Openshift odh Operator"
-  ibm.mas_devops.apply_subscription:
-    namespace: "{{ openshift_namespace }}"
-    package_name: "opendatahub-operator"
-    package_channel: "{{ odh_channel }}"
-    catalog_source: "{{ odh_catalog_source }}"
-  register: subscription
+# # Install Operator & create entitlement openshift-odh
+# # -----------------------------------------------------------------------------
+# - name: "Install Openshift odh Operator"
+#   ibm.mas_devops.apply_subscription:
+#     namespace: "{{ openshift_namespace }}"
+#     package_name: "opendatahub-operator"
+#     package_channel: "{{ odh_channel }}"
+#     catalog_source: "{{ odh_catalog_source }}"
+#   register: subscription
+
 
+# # Wait until the Opendata Hub CRD is available
+# # -----------------------------------------------------------------------------
+# - name: "Wait until the Opendata Hub CRD is available"
+#   include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml"
+#   vars:
+#     crd_name: knativeservings.operator.knative.dev
 
-# Wait until the Opendata Hub CRD is available
-# -----------------------------------------------------------------------------
-- name: "Wait until the Opendata Hub CRD is available"
-  include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml"
-  vars:
-    crd_name: knativeservings.operator.knative.dev
+# enable following role temporary until find a way to use latest ODH versions and switch to apply_subscription role
+- name: "Install Openshift odh Operator specific version"
+  kubernetes.core.k8s:
+    apply: yes
+    definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}"
 
 - name: Await availability of ODH Install Plans
   pause:

ibm/mas_devops/roles/odh/tasks/serverless-operator.yml

@@ -1,18 +1,24 @@
 ---
-# 1. Install Operator & create entitlement openshift-serverless
-# -----------------------------------------------------------------------------
-- name: "Install Openshift Serverless Operator"
-  ibm.mas_devops.apply_subscription:
-    namespace: "{{ serverless_namespace }}"
-    package_name: "serverless-operator"
-    package_channel: "{{ serverless_channel }}"
-    catalog_source: "{{ serverless_catalog_source }}"
-  register: subscription
+# # 1. Install Operator & create entitlement openshift-serverless
+# # -----------------------------------------------------------------------------
+# - name: "Install Openshift Serverless Operator"
+#   ibm.mas_devops.apply_subscription:
+#     namespace: "{{ serverless_namespace }}"
+#     package_name: "serverless-operator"
+#     package_channel: "{{ serverless_channel }}"
+#     catalog_source: "{{ serverless_catalog_source }}"
+#   register: subscription
+
 
+# # 2. Wait until the Serverless CRD is available
+# # -----------------------------------------------------------------------------
+# - name: "Wait until the Serverless CRD is available"
+#   include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml"
+#   vars:
+#     crd_name: knativeservings.operator.knative.dev
 
-# 2. Wait until the Serverless CRD is available
-# -----------------------------------------------------------------------------
-- name: "Wait until the Serverless CRD is available"
-  include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml"
-  vars:
-    crd_name: knativeservings.operator.knative.dev
+# # enable following role temporary until find a way to use openshift-serverless and switch to apply_subscription role
+- name: "Install Openshift Serverless Operator"
+  kubernetes.core.k8s:
+    apply: yes
+    definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}"

ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2

@@ -0,0 +1,12 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: opendatahub-operator
+    namespace: openshift-operators
+spec:
+    channel: "{{ odh_channel }}"
+    installPlanApproval: Manual
+    name: opendatahub-operator
+    source: "{{ odh_catalog_source }}"
+    sourceNamespace: openshift-marketplace
+    startingCSV: "{{ odh_operator_version }}"

ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2

@@ -0,0 +1,17 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+    name: operatorgroup
+    namespace: openshift-serverless
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: serverless-operator
+    namespace: openshift-serverless
+spec:
+    channel: stable
+    installPlanApproval: Automatic
+    name: serverless-operator
+    source: redhat-operators
+    sourceNamespace: openshift-marketplace