Rename the manager-role role

* This commit renames the Role and ClusterRole "manager-role" to "metallb-manager-role" (plus the RoleBinding/ClusterRoleBinding resource) to prevent collisions with other resources in the cluster. * Deleted old and unused YAMLs from config/rbac. fixes #322 Signed-off-by: liornoy <[email protected]>
metallb · Mar 23, 2023 · ba512c3 · ba512c3
1 parent 96db191
commit ba512c3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 60 deletions.
diff --git a/Makefile b/Makefile
@@ -116,7 +116,7 @@ bin: manifests kustomize ## Create manifests
 	$(KUSTOMIZE) build config/metallb_rbac >> bin/$(BIN_FILE)
 
 manifests: controller-gen generate-metallb-manifests  ## Generate manifests e.g. CRD, RBAC etc.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=metallb-manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	sed -i -e 's/validating-webhook-configuration/metallb-operator-webhook-configuration/g' config/webhook/manifests.yaml
 	sed -i -e 's/webhook-service/metallb-operator-webhook-service/g' config/webhook/manifests.yaml
 

diff --git a/bin/metallb-operator.yaml b/bin/metallb-operator.yaml
@@ -3335,7 +3335,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: metallb-manager-role
   namespace: metallb-system
 rules:
 - apiGroups:
@@ -3397,7 +3397,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: metallb-manager-role
 rules:
 - apiGroups:
   - ""
@@ -3500,12 +3500,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: manager-rolebinding
+  name: metallb-manager-rolebinding
   namespace: metallb-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: manager-role
+  name: metallb-manager-role
 subjects:
 - kind: ServiceAccount
   name: manager-account
@@ -3514,11 +3514,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: manager-rolebinding
+  name: metallb-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: manager-role
+  name: metallb-manager-role
 subjects:
 - kind: ServiceAccount
   name: manager-account

diff --git a/...le_rbac.authorization.k8s.io_v1_role.yaml → ...le_rbac.authorization.k8s.io_v1_role.yaml b/...le_rbac.authorization.k8s.io_v1_role.yaml → ...le_rbac.authorization.k8s.io_v1_role.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: metallb-manager-role
 rules:
 - apiGroups:
   - ""

diff --git a/....authorization.k8s.io_v1_rolebinding.yaml → ....authorization.k8s.io_v1_rolebinding.yaml b/....authorization.k8s.io_v1_rolebinding.yaml → ....authorization.k8s.io_v1_rolebinding.yaml
@@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   creationTimestamp: null
-  name: manager-rolebinding
+  name: metallb-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: manager-role
+  name: metallb-manager-role
 subjects:
 - kind: ServiceAccount
   name: manager-account

diff --git a/config/rbac/metallb_editor_role.yaml b/config/rbac/metallb_editor_role.yaml
diff --git a/config/rbac/metallb_viewer_role.yaml b/config/rbac/metallb_viewer_role.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: metallb-manager-role
 rules:
 - apiGroups:
   - ""
@@ -107,7 +107,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: metallb-manager-role
   namespace: metallb-system
 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: manager-rolebinding
+  name: metallb-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: manager-role
+  name: metallb-manager-role
 subjects:
 - kind: ServiceAccount
   name: manager-account
@@ -14,11 +14,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: manager-rolebinding
+  name: metallb-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: manager-role
+  name: metallb-manager-role
 subjects:
 - kind: ServiceAccount
   name: manager-account