Fix indefinite stuck Pending pod on a deleted node

kubernetes-sigs · Mar 9, 2023 · 1d00341 · 1d00341
1 parent f1f3e83
commit 1d00341
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/controller/controller.go b/controller/controller.go
@@ -1404,10 +1404,14 @@ func (ctrl *ProvisionController) provisionClaimOperation(ctx context.Context, cl
 	if nodeName, ok := getString(claim.Annotations, annSelectedNode, annAlphaSelectedNode); ok {
 		if ctrl.nodeLister != nil {
 			selectedNode, err = ctrl.nodeLister.Get(nodeName)
+			// if node does not exist, remove volume.kubernetes.io/selected-node annotation
+			if apierrs.IsNotFound(err) {
+				delete(claim.Annotations, annSelectedNode)
+			}
 		} else {
 			selectedNode, err = ctrl.client.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{}) // TODO (verult) cache Nodes
 		}
-		if err != nil {
+		if err != nil && !apierrs.IsNotFound(err) {
 			err = fmt.Errorf("failed to get target node: %v", err)
 			ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, "ProvisioningFailed", err.Error())
 			return ProvisioningNoChange, err