Address PR comments.

manifests/rhoai/kubeflow-training-roles.yaml

@@ -3,22 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kubeflow-training-admin
-  labels:
-#    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-aggregationRule:
-  clusterRoleSelectors:
-    - matchLabels:
-#        rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
-        rbac.authorization.k8s.io/aggregate-to-admin: "true"
-rules: []
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: kubeflow-training-edit
+  name: training-edit
   labels:
 #    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true"
 #    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
@@ -76,7 +61,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kubeflow-training-view
+  name: training-view
   labels:
 #    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"

manifests/rhoai/kustomization.yaml

@@ -8,7 +8,7 @@ namespace: opendatahub
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: kfto-
+namePrefix: kubeflow-
 
 configMapGenerator:
 - name: rhoai-config
@@ -36,12 +36,10 @@ resources:
 - ../base
 - kubeflow-training-roles.yaml
 - monitor.yaml
-- binding_admin_roles.yaml
-#- webhook_network_policy.yaml
-#- batch-user-rolebinding.yaml
 
 patches:
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type
 - path: manager_config_patch.yaml
 - path: manager_metrics_patch.yaml
+- path: manager_delete_metrics_service_patch.yaml

manifests/rhoai/manager_delete_metrics_service_patch.yaml

@@ -0,0 +1,6 @@
+# Delete the service created in base
+$patch: delete
+apiVersion: v1
+kind: Service
+metadata:
+  name: training-operator

manifests/rhoai/manager_metrics_patch.yaml

@@ -2,13 +2,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: training-operator
-#  namespace: opendatahub
 spec:
   template:
     spec:
       containers:
       - name: training-operator
         ports:
         - containerPort: 8080
-          protocol: TCP
           name: metrics

manifests/rhoai/monitor.yaml

@@ -2,8 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: controller-manager-metrics-monitor
-  namespace: opendatahub
+  name: training-operator-metrics-monitor
 spec:
   selector:
     matchLabels: