From 2032b742546bd78ea6ac257c6e61fa9a31f67cfe Mon Sep 17 00:00:00 2001 From: Alexander Constantinescu Date: Tue, 10 Oct 2023 19:09:44 +0200 Subject: [PATCH] KCCM: fix GCP ILB by reintroducing readiness predicate for eTP:Local --- .../k8s.io/cloud-provider/controllers/service/controller.go | 1 + .../cloud-provider/controllers/service/controller_test.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/controller.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller.go index b51eee68c72..5a6a5079f82 100644 --- a/staging/src/k8s.io/cloud-provider/controllers/service/controller.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/controller.go @@ -1002,6 +1002,7 @@ var ( etpLocalNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{ nodeIncludedPredicate, nodeUnTaintedPredicate, + nodeReadyPredicate, } stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{ nodeNotDeletedPredicate, diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go index 47851447c6e..2fa2a7fb35a 100644 --- a/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go @@ -523,6 +523,8 @@ func TestNodeChangesForExternalTrafficPolicyLocalServices(t *testing.T) { }, }, expectedUpdateCalls: []fakecloud.UpdateBalancerCall{ + {Service: etpLocalservice1, Hosts: []*v1.Node{node1, node3}}, + {Service: etpLocalservice2, Hosts: []*v1.Node{node1, node3}}, {Service: service3, Hosts: []*v1.Node{node1, node3}}, }, }, { @@ -547,6 +549,8 @@ func TestNodeChangesForExternalTrafficPolicyLocalServices(t *testing.T) { }, }, expectedUpdateCalls: []fakecloud.UpdateBalancerCall{ + {Service: etpLocalservice1, Hosts: []*v1.Node{node1, node2, node3}}, + {Service: etpLocalservice2, Hosts: []*v1.Node{node1, node2, node3}}, {Service: service3, Hosts: []*v1.Node{node1, node2, node3}}, }, }, {