Skip to content

operator: Fix delete ClusterRule name #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2024
Merged

operator: Fix delete ClusterRule name #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions pkg/operator/controller/instance_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const (
StatusModeNotExist = "NotExist"
StatusModeProgressing = "ProgressingMode"
StatusModeReady = "Ready"
ClusterRoleName = InstanceNamespace + ":" + cpapi.Name
)

// InstanceReconciler reconciles a ClusterLink instance object.
Expand Down Expand Up @@ -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{
{
Expand Down Expand Up @@ -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{
{
Expand Down Expand Up @@ -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
}
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/controller/instance_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}}
Expand Down