update: rhoai

redhat-na-ssa · Jul 29, 2024 · 9a74386 · 9a74386
1 parent 523f63d
commit 9a74386
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.sh b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.sh
@@ -22,4 +22,11 @@ SERVICEMESH_RESOURCES=(
   done
 }
 
+approve_install(){
+    oc -n redhat-ods-operator \
+    patch subscription rhods-operator \
+    --type=merge --patch '{"spec":{"installPlanApproval":{"Automatic"}}}'
+}
+
 wait_for_service_mesh
+approve_install
diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.yaml b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.yaml
@@ -21,6 +21,14 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - operators.coreos.com
+    resources:
+      - subscriptions
+    verbs:
+      - get
+      - list
+      - patch
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/components/operators/rhods-operator/operator/overlays/stable-pre-2.6/kustomization.yaml b/components/operators/rhods-operator/operator/overlays/stable-pre-2.6/kustomization.yaml
diff --git a/components/operators/rhods-operator/operator/overlays/stable-pre-2.6/patch-channel.yaml b/components/operators/rhods-operator/operator/overlays/stable-pre-2.6/patch-channel.yaml
diff --git a/demos/rhoai-demo-ready/kustomization.yaml b/demos/rhoai-demo-ready/kustomization.yaml
@@ -44,6 +44,14 @@ patches:
       - op: replace
         path: /spec/text
         value: 'DEMO: Red Hat OpenShift AI (RHOAI)'
+    # kludge: allow servicemesh to install before rhoai
+  - target:
+      kind: Subscription
+      name: rhods-operator
+    patch: |-
+      - op: replace
+        path: /spec/installPlanApproval
+        value: Manual
   # - target:
   #     group: user.openshift.io
   #     kind: Group