Fix timeSinceToBeDeletedTaintAdded

hsbc · Dec 20, 2024 · d4c87c8 · d4c87c8
1 parent f901691
commit d4c87c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cloudprovider/gcp/cloud_provider.go b/pkg/cloudprovider/gcp/cloud_provider.go
@@ -215,7 +215,7 @@ func timeSinceToBeDeletedTaintAdded(node *corev1.Node, now time.Time) time.Durat
 	// Retrieve taint value
 	toBeDeletedTaintAddedValue := ""
 	for _, taint := range node.Spec.Taints {
-		if taint.Key == kubernetes.ToBeDeletedTaint && taint.Value == "ToBeDeletedByClusterAutoscaler" {
+		if taint.Key == kubernetes.ToBeDeletedTaint && taint.Effect == corev1.TaintEffectNoSchedule {
 			toBeDeletedTaintAddedValue = taint.Value
 			break
 		}

diff --git a/pkg/cloudprovider/gcp/cloud_provider_test.go b/pkg/cloudprovider/gcp/cloud_provider_test.go
@@ -106,16 +106,16 @@ func TestTimeSinceToBeDeletedTaintAdded(t *testing.T) {
 					},
 				},
 			},
-			now:                            time.Date(0, 0, 0, 0, 0, 60, 0, time.UTC),
-			timeSinceToBeDeletedTaintAdded: 60 * time.Second,
+			now:                            time.Date(0, 0, 0, 0, 1, 0, 0, time.UTC),
+			timeSinceToBeDeletedTaintAdded: time.Minute,
 		},
 		"futureTaint": {
 			node: &corev1.Node{
 				Spec: corev1.NodeSpec{
 					Taints: []corev1.Taint{
 						{
 							Key:    "ToBeDeletedByClusterAutoscaler",
-							Value:  fmt.Sprint(time.Date(0, 0, 0, 0, 0, 60, 0, time.UTC).Unix()),
+							Value:  fmt.Sprint(time.Date(0, 0, 0, 0, 1, 0, 0, time.UTC).Unix()),
 							Effect: corev1.TaintEffectNoSchedule,
 						},
 					},