Merge pull request #181 from Jooho/0.11-sync

update fast manifests based on main branch

opendatahub/odh-manifests/model-mesh/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:

opendatahub/odh-manifests/model-mesh/odh-model-controller/default/kustomization.yaml

@@ -1,3 +1,3 @@
 bases:
   - ../rbac
-  - ../manager
+  - ../manager

opendatahub/odh-manifests/model-mesh/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

opendatahub/odh-manifests/model-mesh/odh-model-controller/overlays/odh/odh_model_controller_manager_patch.yaml

@@ -11,11 +11,6 @@ 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

opendatahub/odh-manifests/model-mesh/odh-model-controller/rbac/kserve_prometheus_clusterrole.yaml

@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kserve-prometheus-k8s
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch

opendatahub/odh-manifests/model-mesh/odh-model-controller/rbac/role.yaml

@@ -205,19 +205,3 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-    - extensions
-  resources:
-    - ingresses
-  verbs:
-    - get
-    - list
-    - watch
-- apiGroups:
-    - networking.k8s.io
-  resources:
-    - ingresses
-  verbs:
-    - get
-    - list
-    - watch