OpenStackClient: wait for pod deletion to complete when recreating pod

olliewalsh · Nov 27, 2024 · 5ec41c3 · 5ec41c3
1 parent 4c23add
commit 5ec41c3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/controllers/client/openstackclient_controller.go b/controllers/client/openstackclient_controller.go
@@ -308,6 +308,10 @@ func (r *OpenStackClientReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	spec := openstackclient.ClientPodSpec(ctx, instance, helper, configVarsHash)
 
 	op, err := controllerutil.CreateOrPatch(ctx, r.Client, osclient, func() error {
+		if !osclient.ObjectMeta.DeletionTimestamp.IsZero() {
+			// Still deleting from a previous reconcile
+			return nil
+		}
 		isPodUpdate := !osclient.ObjectMeta.CreationTimestamp.IsZero()
 		if !isPodUpdate {
 			osclient.Spec = spec
@@ -349,6 +353,10 @@ func (r *OpenStackClientReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 		return ctrl.Result{}, fmt.Errorf("Failed to create or update pod %s: %w", osclient.Name, err)
 	}
+	if !osclient.ObjectMeta.DeletionTimestamp.IsZero() {
+		Log.Info("OpenStackClient pod deletion pending")
+		return ctrl.Result{Requeue: true}, nil
+	}
 
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(