Rename the manager-role role

This commit renames the manager-role to metallb-manager-role to prevent collisions with other Cluster Roles resources. Deleted unused YAMLs from bundle/manifests and config/rbac. fixes metallb#322 Signed-off-by: liornoy <[email protected]>
liornoy · Mar 21, 2023 · 2b619e9 · 2b619e9
1 parent ab12aee
commit 2b619e9
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 132 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/bundle/manifests/manager-role_rbac.authorization.k8s.io_v1_role.yaml b/bundle/manifests/manager-role_rbac.authorization.k8s.io_v1_role.yaml
diff --git a/bundle/manifests/manager-rolebinding_rbac.authorization.k8s.io_v1_rolebinding.yaml b/bundle/manifests/manager-rolebinding_rbac.authorization.k8s.io_v1_rolebinding.yaml
diff --git a/bundle/manifests/metallb-operator.clusterserviceversion.yaml b/bundle/manifests/metallb-operator.clusterserviceversion.yaml
@@ -273,7 +273,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/metallb/metallb-operator
-    createdAt: "2023-03-16T10:08:32Z"
+    createdAt: "2023-03-20T16:01:09Z"
     description: An operator for deploying MetalLB on a kubernetes cluster.
     operators.operatorframework.io/builder: operator-sdk-v1.26.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -6,5 +6,5 @@ patchesStrategicMerge:
   - env.yaml
 images:
   - name: controller
-    newName: metallboperator
+    newName: quay.io/metallb/metallb-operator
     newTag: main
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