Update manifest: adjust permissions, and format changes

Signed-off-by: Xinmin Du <[email protected]>

manifests/v2/overlays/kubeflow/kubeflow-training-roles.yaml

@@ -3,11 +3,11 @@ kind: ClusterRole
 metadata:
   name: kubeflow-training-admin-v2
   labels:
-    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true"
+    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin-v2: "true"
 aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
-        rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
+        rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin-v2: "true"
 rules: []
 
 ---
@@ -16,12 +16,14 @@ kind: ClusterRole
 metadata:
   name: kubeflow-training-edit-v2
   labels:
-    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true"
-    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin: "true"
+    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit-v2: "true"
+    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-training-admin-v2: "true"
 rules:
   - apiGroups:
       - kubeflow.org
     resources:
+      - clustertrainingruntimes
+      - trainingruntimes
       - trainjobs
     verbs:
       - create
@@ -31,15 +33,6 @@ rules:
       - patch
       - update
       - watch
-  - apiGroups:
-      - kubeflow.org
-    resources:
-      - clustertrainingruntimes
-      - trainingruntimes
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - kubeflow.org
     resources:
@@ -56,22 +49,14 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - ""
-    resources:
-      - events
-    verbs:
-      - get
-      - list
-      - watch
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: kubeflow-training-view-v2
   labels:
-    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true"
+    rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view-v2: "true"
 rules:
   - apiGroups:
       - kubeflow.org
@@ -88,4 +73,4 @@ rules:
     resources:
       - trainjobs/status
     verbs:
-      - get
+      - get

manifests/v2/overlays/kubeflow/kustomization.yaml

@@ -2,8 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../base
+  - ../../base/crds
+  - ../../base/manager
+  - ../../base/rbac
+  - ../../base/webhook
+  - ../../base/runtimes/pre-training
   - kubeflow-training-roles.yaml
+  # TODO (andreyvelich): JobSet should support kubeflow-system namespace.
   - https://github.com/kubernetes-sigs/jobset/releases/download/v0.6.0/manifests.yaml
 images:
   - name: kubeflow/training-operator-v2
@@ -12,4 +17,4 @@ secretGenerator:
   - name: training-operator-v2-webhook-cert
     namespace: kubeflow-system
     options:
-      disableNameSuffixHash: true
+      disableNameSuffixHash: true