Merge pull request #16 from appuio/change/unique-clusterrole

Make API server ClusterRole name more unique
appuio · Jan 10, 2022 · 1133789 · 1133789
2 parents cdde5ec + 46d94bc
commit 1133789
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ generate: ## Generate manifests e.g. CRD, RBAC etc.
 	# Generate code
 	go run sigs.k8s.io/controller-tools/cmd/controller-gen object paths="./..."
 	# Generate CRDs
-	go run sigs.k8s.io/controller-tools/cmd/controller-gen rbac:roleName=control-api webhook paths="./..." output:crd:artifacts:config=$(CRD_ROOT_DIR)/v1/base crd:crdVersions=v1
+	go run sigs.k8s.io/controller-tools/cmd/controller-gen rbac:roleName=control-api-apiserver webhook paths="./..." output:crd:artifacts:config=$(CRD_ROOT_DIR)/v1/base crd:crdVersions=v1
 
 .PHONY: crd
 crd: generate ## Generate CRD to file

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: control-api
+  name: control-api-apiserver
 rules:
 - apiGroups:
   - ""

diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
@@ -1,11 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: control-api
+  name: control-api-apiserver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: control-api
+  name: control-api-apiserver
 subjects:
 - kind: ServiceAccount
   name: control-api