Skip to content

Commit 0592d96

Browse files
committed
fix: add IgnoreUnexported to Node Taints comparison
1 parent f24b413 commit 0592d96

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

cloud/services/container/nodepools/reconcile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func (s *Service) checkDiffAndPrepareUpdateConfig(existingNodePool *containerpb.
370370
}
371371
}
372372
// Kubernetes taints
373-
if !cmp.Equal(desiredNodePool.GetConfig().GetTaints(), existingNodePool.GetConfig().GetTaints()) {
373+
if !cmp.Equal(desiredNodePool.GetConfig().GetTaints(), existingNodePool.GetConfig().GetTaints(), cmpopts.IgnoreUnexported(containerpb.NodeTaint{})) {
374374
needUpdate = true
375375
updateNodePoolRequest.Taints = &containerpb.NodeTaints{
376376
Taints: desiredNodePool.GetConfig().GetTaints(),

test/e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,7 @@ spec:
6060
scaling:
6161
minCount: ${GKE_MACHINE_POOL_MIN}
6262
maxCount: ${GKE_MACHINE_POOL_MAX}
63-
63+
kubernetesTaints:
64+
- key: "key1"
65+
value: "value1"
66+
effect: "NoSchedule"

0 commit comments

Comments
 (0)