Skip to content

[release-4.17] Avoid using lb-ext.kubeconfig for seedgen cleanup #6885

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

Closed
openshift-cherrypick-robot wants to merge 1 commit into from
Closed

[release-4.17] Avoid using lb-ext.kubeconfig for seedgen cleanup #6885

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
1 change: 1 addition & 0 deletions bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ rules:
resources:
- pods
verbs:
- delete
- get
- list
- watch
Expand Down
24 changes: 19 additions & 5 deletions controllers/seedgen_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var phases = struct {
//+kubebuilder:rbac:groups="",resources=events,verbs=create;patch
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch;delete
//+kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch
//+kubebuilder:rbac:groups="",resources=pods,verbs=delete;get;list;watch
//+kubebuilder:rbac:groups=config.openshift.io,resources=clusterversions,verbs=get;list;watch
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=delete
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=delete
Expand Down Expand Up @@ -279,6 +279,22 @@ func (r *SeedGeneratorReconciler) cleanupOldRenderedMachineConfigs(ctx context.C
return nil
}

func (r *SeedGeneratorReconciler) deletePodsWithPhase(ctx context.Context, phase corev1.PodPhase) error {
podList := &corev1.PodList{}
if err := r.List(ctx, podList); err != nil {
return fmt.Errorf("failed to list pods: %w", err)
}
for i := range podList.Items {
if podList.Items[i].Status.Phase != phase {
continue
}
if err := r.Delete(ctx, &podList.Items[i]); err != nil {
return fmt.Errorf("failed to delete pod %s/%s: %w", podList.Items[i].Namespace, podList.Items[i].Name, err)
}
}
return nil
}

// Clean up ACM and other resources on the cluster
func (r *SeedGeneratorReconciler) cleanupClusterResources(ctx context.Context) error {
// Ensure that the dependent resources are deleted
Expand Down Expand Up @@ -819,15 +835,13 @@ func (r *SeedGeneratorReconciler) generateSeedImage(ctx context.Context, seedgen
return
}

// TODO: Can this be done cleanly via client? The client.DeleteAllOf seems to require a specified namespace, so maybe loop over the namespaces
r.Log.Info("Cleaning completed and failed pods")
kubeconfigArg := fmt.Sprintf("--kubeconfig=%s", common.KubeconfigFile)
if _, err := r.Executor.Execute("oc", "delete", "pod", kubeconfigArg, "--field-selector=status.phase==Succeeded", "--all-namespaces"); err != nil {
if err := r.deletePodsWithPhase(ctx, corev1.PodSucceeded); err != nil {
rc = fmt.Errorf("failed to cleanup Succeeded pods: %w", err)
setSeedGenStatusFailed(seedgen, rc.Error())
return
}
if _, err := r.Executor.Execute("oc", "delete", "pod", kubeconfigArg, "--field-selector=status.phase==Failed", "--all-namespaces"); err != nil {
if err := r.deletePodsWithPhase(ctx, corev1.PodFailed); err != nil {
rc = fmt.Errorf("failed to cleanup Failed pods: %w", err)
setSeedGenStatusFailed(seedgen, rc.Error())
return
Expand Down