Merge pull request #2015 from torredil/k8s-interface-82361

Run taint removal only if Kubernetes API is available
kubernetes-sigs · Apr 22, 2024 · 957a5f1 · 957a5f1
2 parents 7df4dd6 + a9902da
commit 957a5f1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/driver/node.go b/pkg/driver/node.go
@@ -96,11 +96,13 @@ func NewNodeService(o *Options, md metadata.MetadataService, m mounter.Mounter,
 	region := os.Getenv("AWS_REGION")
 	klog.InfoS("regionFromSession Node service", "region", region)
 
-	// Remove taint from node to indicate driver startup success
-	// This is done at the last possible moment to prevent race conditions or false positive removals
-	time.AfterFunc(taintRemovalInitialDelay, func() {
-		removeTaintInBackground(k, taintRemovalBackoff, removeNotReadyTaint)
-	})
+	if k != nil {
+		// Remove taint from node to indicate driver startup success
+		// This is done at the last possible moment to prevent race conditions or false positive removals
+		time.AfterFunc(taintRemovalInitialDelay, func() {
+			removeTaintInBackground(k, taintRemovalBackoff, removeNotReadyTaint)
+		})
+	}
 
 	return &NodeService{
 		metadata: md,