Skip to content

HYPERFLEET-1040 - fix: Use label selector to clean up orphaned cluster-scoped RBAC resources #92

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
openshift-merge-bot merged 1 commit into from
May 11, 2026
+7 −2
Merged

HYPERFLEET-1040 - fix: Use label selector to clean up orphaned cluster-scoped RBAC resources #92

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
9 changes: 7 additions & 2 deletions pkg/helper/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,16 @@ func (h *Helper) UninstallAdapter(ctx context.Context, releaseName, namespace st

// cleanupClusterScopedResources removes orphaned cluster-scoped resources that may be left
// after Helm uninstall. This is a best-effort cleanup and logs errors without failing.
// Uses label selectors instead of names so it works regardless of the chart's naming scheme.
func (h *Helper) cleanupClusterScopedResources(ctx context.Context, releaseName string) {
cmdCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

labelSelector := fmt.Sprintf("app.kubernetes.io/instance=%s", releaseName)

// Try to delete ClusterRole
clusterRoleCmd := exec.CommandContext(cmdCtx, "kubectl", "delete", "clusterrole", releaseName,
clusterRoleCmd := exec.CommandContext(cmdCtx, "kubectl", "delete", "clusterrole", //nolint:gosec // labelSelector is derived from releaseName, not user input
"-l", labelSelector,
"--ignore-not-found=true")
if output, err := clusterRoleCmd.CombinedOutput(); err != nil {
logger.Info("could not delete ClusterRole (may not exist)",
Expand All @@ -237,7 +241,8 @@ func (h *Helper) cleanupClusterScopedResources(ctx context.Context, releaseName
}

// Try to delete ClusterRoleBinding
clusterRoleBindingCmd := exec.CommandContext(cmdCtx, "kubectl", "delete", "clusterrolebinding", releaseName,
clusterRoleBindingCmd := exec.CommandContext(cmdCtx, "kubectl", "delete", "clusterrolebinding", //nolint:gosec // labelSelector is derived from releaseName, not user input
"-l", labelSelector,
"--ignore-not-found=true")
if output, err := clusterRoleBindingCmd.CombinedOutput(); err != nil {
logger.Info("could not delete ClusterRoleBinding (may not exist)",
Expand Down