operator: Fix delete ClusterRule name (#694)

Fix the name of clusterrole and clusterrolebindings (same name for deletion and creation). Signed-off-by: Kfir Toledo <[email protected]>
clusterlink-net · Sep 22, 2024 · 493ba60 · 493ba60
1 parent 392e274
commit 493ba60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pkg/operator/controller/instance_controller.go b/pkg/operator/controller/instance_controller.go
@@ -48,6 +48,7 @@ const (
 	StatusModeNotExist    = "NotExist"
 	StatusModeProgressing = "ProgressingMode"
 	StatusModeReady       = "Ready"
+	ClusterRoleName       = InstanceNamespace + ":" + cpapi.Name
 )
 
 // InstanceReconciler reconciles a ClusterLink instance object.
@@ -431,7 +432,7 @@ func (r *InstanceReconciler) createAccessControl(ctx context.Context, name, name
 	// Create the ClusterRole for the controlplane.
 	clusterRole := &rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name + namespace,
+			Name: ClusterRoleName,
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -499,12 +500,12 @@ func (r *InstanceReconciler) createAccessControl(ctx context.Context, name, name
 	// Create ClusterRoleBinding for the controlplane.
 	clusterRoleBinding := &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name + namespace,
+			Name: ClusterRoleName,
 		},
 		RoleRef: rbacv1.RoleRef{
 			APIGroup: "rbac.authorization.k8s.io",
 			Kind:     "ClusterRole",
-			Name:     name + namespace,
+			Name:     ClusterRoleName,
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -615,6 +616,8 @@ func (r *InstanceReconciler) createResource(ctx context.Context, object client.O
 func (r *InstanceReconciler) deleteClusterLink(ctx context.Context, namespace string) error {
 	// Delete controlPlane Resources
 	cpObj := metav1.ObjectMeta{Name: cpapi.Name, Namespace: namespace}
+	cprRuleObj := metav1.ObjectMeta{Name: ClusterRoleName, Namespace: namespace}
+
 	if err := r.deleteResource(ctx, &appsv1.Deployment{ObjectMeta: cpObj}); err != nil {
 		return err
 	}
@@ -623,11 +626,11 @@ func (r *InstanceReconciler) deleteClusterLink(ctx context.Context, namespace st
 		return err
 	}
 
-	if err := r.deleteResource(ctx, &rbacv1.ClusterRole{ObjectMeta: cpObj}); err != nil {
+	if err := r.deleteResource(ctx, &rbacv1.ClusterRole{ObjectMeta: cprRuleObj}); err != nil {
 		return err
 	}
 
-	if err := r.deleteResource(ctx, &rbacv1.ClusterRoleBinding{ObjectMeta: cpObj}); err != nil {
+	if err := r.deleteResource(ctx, &rbacv1.ClusterRoleBinding{ObjectMeta: cprRuleObj}); err != nil {
 		return err
 	}
 

diff --git a/pkg/operator/controller/instance_controller_test.go b/pkg/operator/controller/instance_controller_test.go
@@ -148,7 +148,7 @@ func TestClusterLinkController(t *testing.T) {
 	cpID := types.NamespacedName{Name: cpapi.Name, Namespace: controller.InstanceNamespace}
 	cpResource := []client.Object{&appsv1.Deployment{}, &corev1.Service{}}
 	roleID := types.NamespacedName{
-		Name:      cpapi.Name + controller.InstanceNamespace,
+		Name:      controller.ClusterRoleName,
 		Namespace: controller.InstanceNamespace,
 	}
 	roleResource := []client.Object{&rbacv1.ClusterRole{}, &rbacv1.ClusterRoleBinding{}}