github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 14:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121116 from alexanderConstantinescu/reintroduce-ready-predicate-foretp-local

Browse Source 
KCCM: fix GCP ILB by reintroducing readiness predicate for eTP:Local
This commit is contained in:
Kubernetes Prow Robot 2023-10-12 00:51:19 +02:00 committed by GitHub
commit 9cf1910b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/cloud-provider/controllers/service/controller.go
View File

@ -1002,6 +1002,7 @@ var (
etpLocalNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{ etpLocalNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{
nodeIncludedPredicate, nodeIncludedPredicate,
nodeUnTaintedPredicate, nodeUnTaintedPredicate,
nodeReadyPredicate,
} }
stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{ stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{
nodeNotDeletedPredicate, nodeNotDeletedPredicate,

4
staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go
View File

@ -523,6 +523,8 @@ func TestNodeChangesForExternalTrafficPolicyLocalServices(t *testing.T) {
}, },
}, },
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{ expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
{Service: etpLocalservice1, Hosts: []*v1.Node{node1, node3}},
{Service: etpLocalservice2, Hosts: []*v1.Node{node1, node3}},
{Service: service3, Hosts: []*v1.Node{node1, node3}}, {Service: service3, Hosts: []*v1.Node{node1, node3}},
}, },
}, { }, {
@ -547,6 +549,8 @@ func TestNodeChangesForExternalTrafficPolicyLocalServices(t *testing.T) {
}, },
}, },
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{ 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}}, {Service: service3, Hosts: []*v1.Node{node1, node2, node3}},
}, },
}, { }, {