Update Makefile

Signed-off-by: Yi Chen <[email protected]>

Makefile

@@ -68,11 +68,14 @@ scheduler-plugins-crd: ## Copy the CRDs from the Scheduler Plugins repository to
 # Instructions for code generation.
 .PHONY: manifests
 manifests: controller-gen ## Generate manifests.
+	# Skip outputing the RBAC and webhook manifests as we will sync them from the manifests templated from the Helm chart.
 	$(CONTROLLER_GEN) "crd:generateEmbeddedObjectMeta=true" rbac:roleName=kubeflow-trainer-controller-manager webhook \
 		paths="./pkg/apis/trainer/v1alpha1/...;./pkg/controller/...;./pkg/runtime/...;./pkg/webhooks/...;./pkg/util/cert/..." \
 		output:crd:artifacts:config=manifests/base/crds \
 		output:rbac:artifacts:config=manifests/base/rbac \
-		output:webhook:artifacts:config=manifests/base/webhook
+		output:rbac:none \
+		output:webhook:artifacts:config=manifests/base/webhook \
+		output:webhook:none
 
 .PHONY: generate
 generate: go-mod-download manifests ## Generate APIs and SDK.

manifests/base/rbac/role.yaml

@@ -1,72 +1,23 @@
----
+# Source: kubeflow-trainer/templates/rbac/role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
-  name: kubeflow-trainer-controller-manager
+  name: kubeflow-trainer-controller
+  namespace: kubeflow-system
+  labels:
+    app.kubernetes.io/name: kubeflow-trainer
+    app.kubernetes.io/instance: kubeflow-trainer
+    app.kubernetes.io/version: "2.0.0"
+    app.kubernetes.io/managed-by: Kustomize
+    app.kubernetes.io/part-of: kubeflow
+    app.kubernetes.io/component: controller
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - update
-  - watch
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - get
-  - list
-  - update
-  - watch
-- apiGroups:
-  - jobset.x-k8s.io
-  resources:
-  - jobsets
-  verbs:
-  - create
-  - get
-  - list
-  - watch
-- apiGroups:
-  - scheduling.x-k8s.io
-  resources:
-  - podgroups
-  verbs:
-  - create
-  - get
-  - list
-  - watch
-- apiGroups:
-  - trainer.kubeflow.org
-  resources:
-  - clustertrainingruntimes
-  - trainingruntimes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - trainer.kubeflow.org
-  resources:
-  - trainjobs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - trainer.kubeflow.org
-  resources:
-  - trainjobs/finalizers
-  - trainjobs/status
-  verbs:
-  - get
-  - patch
-  - update
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - list
+      - watch
+      - update