Merge branch 'kubernetes-sigs:main' into main

nikmohan123 · Mar 13, 2024 · 6c554a4 · 6c554a4
2 parents 7e9d89d + 9c6012c
commit 6c554a4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/hack/install-kwok.sh b/hack/install-kwok.sh
@@ -50,8 +50,8 @@ cat <<EOF > "${BASE}/kustomization.yaml"
     newTag: "${KWOK_LATEST_RELEASE}"
   resources:
   - "https://github.com/${KWOK_REPO}/kustomize/kwok?ref=${KWOK_LATEST_RELEASE}"
-  patchesStrategicMerge:
-  - tolerate-all.yaml
+  patches:
+  - path: tolerate-all.yaml
 EOF
 
 # Define 10 different kwok controllers to handle large load

diff --git a/pkg/controllers/node/termination/controller.go b/pkg/controllers/node/termination/controller.go
@@ -112,8 +112,11 @@ func (c *Controller) deleteAllNodeClaims(ctx context.Context, node *v1.Node) err
 		return err
 	}
 	for i := range nodeClaimList.Items {
-		if err := c.kubeClient.Delete(ctx, &nodeClaimList.Items[i]); err != nil {
-			return client.IgnoreNotFound(err)
+		// If we still get the NodeClaim, but it's already marked as terminating, we don't need to call Delete again
+		if nodeClaimList.Items[i].DeletionTimestamp.IsZero() {
+			if err := c.kubeClient.Delete(ctx, &nodeClaimList.Items[i]); err != nil {
+				return client.IgnoreNotFound(err)
+			}
 		}
 	}
 	return nil

diff --git a/pkg/controllers/nodeclaim/termination/controller.go b/pkg/controllers/nodeclaim/termination/controller.go
@@ -74,9 +74,12 @@ func (c *Controller) Finalize(ctx context.Context, nodeClaim *v1beta1.NodeClaim)
 		return reconcile.Result{}, err
 	}
 	for _, node := range nodes {
-		// We delete nodes to trigger the node finalization and deletion flow
-		if err = c.kubeClient.Delete(ctx, node); client.IgnoreNotFound(err) != nil {
-			return reconcile.Result{}, err
+		// If we still get the Node, but it's already marked as terminating, we don't need to call Delete again
+		if node.DeletionTimestamp.IsZero() {
+			// We delete nodes to trigger the node finalization and deletion flow
+			if err = c.kubeClient.Delete(ctx, node); client.IgnoreNotFound(err) != nil {
+				return reconcile.Result{}, err
+			}
 		}
 	}
 	// We wait until all the nodes associated with this nodeClaim have completed their deletion before triggering the finalization of the nodeClaim