Skip to content

Clean up MCM RBAC resources migration logic #1304

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
Oct 7, 2025
+0 −58
Merged

Clean up MCM RBAC resources migration logic #1304

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
8 changes: 0 additions & 8 deletions cmd/gardener-extension-provider-azure/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,6 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
}

if reconcileOpts.ExtensionClass != "garden" {
// TODO (georgibaltiev): Remove after the release of version 1.55.0
log.Info("Adding migration runnables")
if err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
return purgeMachineControllerManagerRBACResources(ctx, mgr.GetClient(), log)
})); err != nil {
return fmt.Errorf("error adding mcm migrations: %w", err)
}

// TODO (kon-angelo): Remove after the release of version 1.46.0
if err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
return purgeTerraformerRBACResources(ctx, mgr.GetClient(), log)
Expand Down
50 changes: 0 additions & 50 deletions cmd/gardener-extension-provider-azure/app/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package app
import (
"context"
"fmt"
"regexp"
"strings"

kutil "github.com/gardener/gardener/pkg/utils/kubernetes"
Expand All @@ -18,55 +17,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var nameRegex = regexp.MustCompile("extensions.gardener.cloud:provider-azure:shoot-.*:machine-controller-manager")

// TODO (georgibaltiev): Remove after the release of version 1.55.0
func purgeMachineControllerManagerRBACResources(ctx context.Context, c client.Client, log logr.Logger) error {
log.Info("Starting the deletion of obsolete ClusterRoles and ClusterRoleBindings")

var (
clusterRoleBindingList = &rbacv1.ClusterRoleBindingList{}
clusterRoleList = &rbacv1.ClusterRoleList{}
)

if err := c.List(ctx, clusterRoleBindingList); err != nil {
return fmt.Errorf("failed to list ClusterRoleBindings: %w", err)
}

for _, clusterRoleBinding := range clusterRoleBindingList.Items {
if nameRegex.Match([]byte(clusterRoleBinding.Name)) {
log.Info("Deleting ClusterRoleBinding", "clusterRoleBinding", client.ObjectKeyFromObject(&clusterRoleBinding))
if err := kutil.DeleteObject(
ctx,
c,
&rbacv1.ClusterRoleBinding{ObjectMeta: metav1.ObjectMeta{Name: clusterRoleBinding.Name}},
); err != nil {
return fmt.Errorf("failed to delete ClusterRoleBinding %s: %w", client.ObjectKeyFromObject(&clusterRoleBinding), err)
}
}
}

if err := c.List(ctx, clusterRoleList); err != nil {
return fmt.Errorf("failed to list ClusterRoles: %w", err)
}

for _, clusterRole := range clusterRoleList.Items {
if nameRegex.Match([]byte(clusterRole.Name)) {
log.Info("Deleting ClusterRole", "clusterRole", client.ObjectKeyFromObject(&clusterRole))
if err := kutil.DeleteObject(
ctx,
c,
&rbacv1.ClusterRole{ObjectMeta: metav1.ObjectMeta{Name: clusterRole.Name}},
); err != nil {
return fmt.Errorf("failed to delete ClusterRole %s: %w", client.ObjectKeyFromObject(&clusterRole), err)
}
}
}

log.Info("Successfully deleted the obsolete ClusterRoles and ClusterRoleBindings")
return nil
}

// TODO (kon-angelo): Remove after the release of version 1.46.0
func purgeTerraformerRBACResources(ctx context.Context, c client.Client, log logr.Logger) error {
log.Info("Starting the deletion of obsolete terraformer resources")
Expand Down
Loading