[major] Major changes for aibroker to aiservice August Patch

instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml → instance-applications/112-ibm-odh/templates/01-odh-serverless-subscription.yaml

@@ -1,5 +1,4 @@
 ---
-
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -8,14 +7,14 @@ metadata:
       argocd.argoproj.io/sync-wave: "117"
 
 ---
-
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
     name: operatorgroup
     namespace: {{ .Values.serverless_namespace}}
     annotations:
       argocd.argoproj.io/sync-wave: "117"
+
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription

instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml → instance-applications/112-ibm-odh/templates/04-odh-operator-subcription.yaml

@@ -1,11 +1,19 @@
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.opendatahub_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "125"
+---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: {{ .Values.opendatahub_OperatorGroup_name}}
   namespace: {{ .Values.opendatahub_namespace}}
   annotations:
       argocd.argoproj.io/sync-wave: "126"
+
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -19,5 +27,5 @@ spec:
     installPlanApproval: {{ .Values.opendatahub_installPlanApproval}}
     name: {{ .Values.opendatahub_name}}
     source: {{ .Values.opendatahub_source}}
-    sourceNamespace: {{ .Values.opendatahub__sourceNamespace}}
+    sourceNamespace: {{ .Values.opendatahub_sourceNamespace}}
     startingCSV: {{ .Values.odh_operator_version }}

instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml → instance-applications/112-ibm-odh/templates/05-odh-namespace.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: "{{ .Values.aibroker_namespace }}"
+  name: "{{ .Values.aiservice_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "128"
 

instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml → instance-applications/112-ibm-odh/templates/06-odh-dsc-init.yaml

@@ -27,7 +27,11 @@ spec:
       metricsCollection: Istio
       name: data-science-smcp
       namespace: istio-system
+{{- if eq .Values.aiservice_odh_model_deployment_type "raw" }}
+    managementState: Removed
+{{- else }}
     managementState: Managed
+{{- end }}
   trustedCABundle:
     customCABundle: ''
     managementState: Managed

instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml → instance-applications/112-ibm-odh/templates/07-odh-data-science-cluster.yaml

@@ -15,12 +15,19 @@ metadata:
 spec:
   components:
     datasciencepipelines:
-      managementState: Managed
+      managementState: Removed
     kserve:
       managementState: Managed
       serving:
+        name: knative-serving
         ingressGateway:
           certificate:
             type: SelfSigned
+{{- if eq .Values.aiservice_odh_model_deployment_type "raw" }}
+        managementState: Removed
+        defaultDeploymentMode: RawDeployment
+{{- else }}
+        managementState: Managed
+{{- end }}
         managementState: Managed
-        name: knative-serving
+

instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml → instance-applications/112-ibm-odh/templates/08-odh-istio-auth.yaml

@@ -5,21 +5,19 @@ metadata:
   name: default
   namespace: opendatahub
   annotations:
-    argocd.argoproj.io/sync-wave: "139"
+    argocd.argoproj.io/sync-wave: "132"
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   mtls:
     mode: PERMISSIVE
-
 ---
-
 apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: ds-pipeline-instance
   namespace: opendatahub
   annotations:
-    argocd.argoproj.io/sync-wave: "162"
+    argocd.argoproj.io/sync-wave: "133"
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   host: ds-pipeline-instance.opendatahub.svc.cluster.local
@@ -28,23 +26,5 @@ spec:
       - port:
           number: 8888
         tls:
-          mode: DISABLE
-
----
-
-apiVersion: networking.istio.io/v1beta1
-kind: DestinationRule
-metadata:
-  name: minio-instance
-  namespace: opendatahub
-  annotations:
-    argocd.argoproj.io/sync-wave: "163"
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-spec:
-  host: minio-instance.opendatahub.svc.cluster.local
-  trafficPolicy:
-    portLevelSettings:
-      - port:
-          number: 9000
-        tls:
-          mode: DISABLE
+          mode: ISTIO_MUTUAL
+

instance-applications/112-ibm-odh/templates/09-odh-networkpolicy.yaml

@@ -0,0 +1,19 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "135"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: allow-odh-model-controller
+  namespace: opendatahub
+spec:
+  podSelector:
+    matchLabels:
+      control-plane: odh-model-controller
+  ingress:
+    - from:
+        - namespaceSelector: {}
+  policyTypes:
+    - Ingress
+