Skip to content
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

fix: make sure machine pools are deleted before gke cluster #1458

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make sure machine pools are deleted before gke cluster #1458

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
32 changes: 32 additions & 0 deletions exp/controllers/gcpmanagedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,17 @@ func (r *GCPManagedClusterReconciler) reconcileDelete(ctx context.Context, clust
log := log.FromContext(ctx).WithValues("controller", "gcpmanagedcluster", "action", "delete")
log.Info("Reconciling Delete GCPManagedCluster")

numDependencies, err := r.dependencyCount(ctx, clusterScope)
if err != nil {
log.Error(err, "error getting cluster dependencies", "namespace", clusterScope.GCPManagedCluster.Namespace, "name", clusterScope.GCPManagedCluster.Name)
return ctrl.Result{}, err
}
if numDependencies > 0 {
log.V(4).Info("GKE cluster still has dependencies - requeue needed", "dependencyCount", numDependencies)
return ctrl.Result{RequeueAfter: reconciler.DefaultRetryTime}, nil
}
log.V(4).Info("GKE cluster has no dependencies")

if clusterScope.GCPManagedControlPlane != nil {
log.Info("GCPManagedControlPlane not deleted yet, retry later")
return ctrl.Result{RequeueAfter: reconciler.DefaultRetryTime}, nil
Expand Down Expand Up @@ -295,3 +306,24 @@ func (r *GCPManagedClusterReconciler) managedControlPlaneMapper() handler.MapFun
}
}
}

func (r *GCPManagedClusterReconciler) dependencyCount(ctx context.Context, clusterScope *scope.ManagedClusterScope) (int, error) {
log := log.FromContext(ctx)

clusterName, clusterNamespace := clusterScope.GCPManagedCluster.Name, clusterScope.GCPManagedCluster.Namespace
log.Info("looking for GKE cluster dependencies", "cluster", klog.KRef(clusterNamespace, clusterName))

listOptions := []client.ListOption{
client.InNamespace(clusterNamespace),
client.MatchingLabels(map[string]string{clusterv1.ClusterNameLabel: clusterName}),
}

var dependencies int
managedMachinePools := &infrav1exp.GCPManagedMachinePoolList{}
if err := r.Client.List(ctx, managedMachinePools, listOptions...); err != nil {
return dependencies, fmt.Errorf("failed to list managed machine pools for cluster %s/%s: %w", clusterNamespace, clusterName, err)
}
dependencies += len(managedMachinePools.Items)

return dependencies, nil
}