Merge pull request #1438 from DataDog/fricounet/reschedule-node-not-exist

[controller] Reschedule provisioning if node is missing

Author: k8s-ci-robot

pkg/controller/controller.go

@@ -701,7 +701,10 @@ func (p *csiProvisioner) prepareProvision(ctx context.Context, claim *v1.Persist
 			p.csiNodeLister,
 			p.nodeLister,
 			p.pvcNodeStore)
-		if err != nil {
+		if apierrors.IsNotFound(err) {
+			// The node or CSINode object can't be found, ask the scheduler for a reschedule
+			return nil, controller.ProvisioningReschedule, err
+		} else if err != nil {
 			return nil, controller.ProvisioningNoChange, fmt.Errorf("error generating accessibility requirements: %v", err)
 		}
 		req.AccessibilityRequirements = requirements

pkg/controller/controller_test.go

@@ -2503,6 +2503,29 @@ func provisionTestcases() (int64, map[string]provisioningTestcase) {
 			expectErr:   true,
 			expectState: controller.ProvisioningFinished,
 		},
+		"fail with selected node but node doesn't exist": {
+			pluginCapabilities: provisionWithTopologyCapabilities,
+			volOpts: controller.ProvisionOptions{
+				SelectedNodeName: nodeBar.Name,
+				StorageClass: &storagev1.StorageClass{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: fakeSCName,
+					},
+					ReclaimPolicy: &deletePolicy,
+					Parameters: map[string]string{
+						"fstype": "ext3",
+					},
+				},
+				PVName: "test-name",
+				PVC: func() *v1.PersistentVolumeClaim {
+					claim := createFakePVC(requestedBytes)
+					claim.Annotations[annSelectedNode] = nodeBar.Name
+					return claim
+				}(),
+			},
+			expectErr:   true,
+			expectState: controller.ProvisioningReschedule,
+		},
 	}
 }