Merge pull request #197 from vaibhavjainwiz/update_stable_manifest_re…

…lease Update Stable Manifest (release branch)
opendatahub-io · Oct 23, 2023 · 52dcc10 · 52dcc10
2 parents aa4ed16 + baeebad
commit 52dcc10
Show file tree

Hide file tree

Showing 33 changed files with 5,381 additions and 3,117 deletions.
diff --git a/...ests/model-mesh/odh-model-controller/overlays/odh/odh_model_controller_manager_patch.yaml b/...ests/model-mesh/odh-model-controller/overlays/odh/odh_model_controller_manager_patch.yaml
@@ -11,6 +11,11 @@ spec:
             - --leader-elect
             - "--monitoring-namespace"
             - "$(MONITORING_NS)"
+            #This is hardcoded to be false in the overlay to model-mesh.
+            # Once Kserve and Modelmesh CRD conflict is resolved and both components can be installed together,
+            # ODH Model Controller will not be deployed as a overlay anymore and will be deployed only as an independent component.
+            # When that happens, the "kserve-enabled" flag needs to be removed
+            - --kserve-enabled=false
           image: $(odh-model-controller)
           env:
             - name: MONITORING_NS

diff --git a/opendatahub/odh-manifests/model-mesh_stable/OWNERS b/opendatahub/odh-manifests/model-mesh_stable/OWNERS
@@ -1,17 +1,19 @@
-approvers:
+ approvers:
   - anishasthana
   - danielezonca
   - heyselbi
   - israel-hdez
   - Jooho
+  - vaibhavjainwiz
   - VedantMahabaleshwarkar
   - Xaenalt
-
+  
 reviewers:
   - anishasthana
   - danielezonca
   - heyselbi
   - israel-hdez
   - Jooho
+  - vaibhavjainwiz
   - VedantMahabaleshwarkar
   - Xaenalt
diff --git a/opendatahub/odh-manifests/model-mesh_stable/base/kustomization.yaml b/opendatahub/odh-manifests/model-mesh_stable/base/kustomization.yaml
@@ -4,6 +4,8 @@ resources:
   - ../odh-modelmesh-controller/overlays/odh
   - ../odh-model-controller/overlays/odh
 
+commonLabels:
+  app.kubernetes.io/part-of: model-mesh
 namespace: opendatahub
 configMapGenerator:
   - envs:

diff --git a/opendatahub/odh-manifests/model-mesh_stable/base/params.env b/opendatahub/odh-manifests/model-mesh_stable/base/params.env
@@ -1,7 +1,7 @@
 monitoring-namespace=opendatahub
-odh-mm-rest-proxy=quay.io/opendatahub/rest-proxy:v0.10.0
-odh-modelmesh-runtime-adapter=quay.io/opendatahub/modelmesh-runtime-adapter:v0.11.0-alpha
-odh-modelmesh=quay.io/opendatahub/modelmesh:v0.11.0-alpha
-odh-openvino=quay.io/opendatahub/openvino_model_server:2022.3-gpu
-odh-modelmesh-controller=quay.io/opendatahub/modelmesh-controller:v0.11.0-alpha
-odh-model-controller=quay.io/opendatahub/odh-model-controller:v0.11.0-alpha
+odh-mm-rest-proxy=quay.io/opendatahub/rest-proxy:v0.11.0
+odh-modelmesh-runtime-adapter=quay.io/opendatahub/modelmesh-runtime-adapter:v0.11.0
+odh-modelmesh=quay.io/opendatahub/modelmesh:v0.11.0
+odh-openvino=quay.io/opendatahub/openvino_model_server:2022.3-release
+odh-modelmesh-controller=quay.io/opendatahub/modelmesh-controller:v0.11.0
+odh-model-controller=quay.io/opendatahub/odh-model-controller:v0.11.0
diff --git a/opendatahub/odh-manifests/model-mesh_stable/odh-model-controller/default/kustomization.yaml b/opendatahub/odh-manifests/model-mesh_stable/odh-model-controller/default/kustomization.yaml
@@ -1,3 +1,3 @@
 bases:
   - ../rbac
-  - ../manager
+  - ../manager
diff --git a/...ahub/odh-manifests/model-mesh_stable/odh-model-controller/overlays/odh/kustomization.yaml b/...ahub/odh-manifests/model-mesh_stable/odh-model-controller/overlays/odh/kustomization.yaml
@@ -5,6 +5,8 @@ resources:
 
 patchesStrategicMerge:
   - odh_model_controller_manager_patch.yaml
+commonLabels:
+  app.kubernetes.io/managed-by: odh-model-controller
 
 configurations:
   - params.yaml
diff --git a/...del-mesh_stable/odh-model-controller/overlays/odh/odh_model_controller_manager_patch.yaml b/...del-mesh_stable/odh-model-controller/overlays/odh/odh_model_controller_manager_patch.yaml
@@ -11,11 +11,11 @@ spec:
             - --leader-elect
             - "--monitoring-namespace"
             - "$(MONITORING_NS)"
-#This is hardcoded to be false in the overlay to model-mesh. 
-# Once Kserve and Modelmesh CRD conflict is resolved and both components can be installed together, 
-# ODH Model Controller will not be deployed as a overlay anymore and will be deployed only as an independent component. 
-# When that happens, the "kserve-enabled" flag needs to be removed
-            - --kserve-enabled=false            
+            #This is hardcoded to be false in the overlay to model-mesh.
+            # Once Kserve and Modelmesh CRD conflict is resolved and both components can be installed together,
+            # ODH Model Controller will not be deployed as a overlay anymore and will be deployed only as an independent component.
+            # When that happens, the "kserve-enabled" flag needs to be removed
+            - --kserve-enabled=false
           image: $(odh-model-controller)
           env:
             - name: MONITORING_NS