From 0592d96941c7d8f54b940b3948d62fbc5d476163 Mon Sep 17 00:00:00 2001 From: Arnaud Farbos Date: Mon, 18 Nov 2024 09:37:25 -0800 Subject: [PATCH 1/2] fix: add IgnoreUnexported to Node Taints comparison --- cloud/services/container/nodepools/reconcile.go | 2 +- .../e2e/data/infrastructure-gcp/cluster-template-ci-gke.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cloud/services/container/nodepools/reconcile.go b/cloud/services/container/nodepools/reconcile.go index a643ac0ec..6350589b3 100644 --- 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 index 228acdb52..105911bcc 100644 --- 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" From ef0b82070e8070beb5777f39e092d2251a6be099 Mon Sep 17 00:00:00 2001 From: Arnaud Farbos Date: Fri, 20 Dec 2024 08:52:01 -0800 Subject: [PATCH 2/2] fix: update GINKGO_FOCUS in Makefile to include 'GKE workload cluster creation' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd44c3a69..0fff980ee 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ test: $(SETUP_ENVTEST) ## Run unit and integration tests KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test ./... $(TEST_ARGS) # Allow overriding the e2e configurations -GINKGO_FOCUS ?= Workload cluster creation +GINKGO_FOCUS ?= (GKE workload|Workload) cluster creation GINKGO_SKIP ?= API Version Upgrade GINKGO_NODES ?= 1 GINKGO_NOCOLOR ?= false