fix: add IgnoreUnexported to Node Taints comparison

kubernetes-sigs · Dec 20, 2024 · 0592d96 · 0592d96
1 parent f24b413
commit 0592d96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cloud/services/container/nodepools/reconcile.go b/cloud/services/container/nodepools/reconcile.go
@@ -370,7 +370,7 @@ func (s *Service) checkDiffAndPrepareUpdateConfig(existingNodePool *containerpb.
 		}
 	}
 	// Kubernetes taints
-	if !cmp.Equal(desiredNodePool.GetConfig().GetTaints(), existingNodePool.GetConfig().GetTaints()) {
+	if !cmp.Equal(desiredNodePool.GetConfig().GetTaints(), existingNodePool.GetConfig().GetTaints(), cmpopts.IgnoreUnexported(containerpb.NodeTaint{})) {
 		needUpdate = true
 		updateNodePoolRequest.Taints = &containerpb.NodeTaints{
 			Taints: desiredNodePool.GetConfig().GetTaints(),

diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml
@@ -60,4 +60,7 @@ spec:
   scaling:
     minCount: ${GKE_MACHINE_POOL_MIN}
     maxCount: ${GKE_MACHINE_POOL_MAX}
-
+  kubernetesTaints:
+    - key: "key1"
+      value: "value1"
+      effect: "NoSchedule"