github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116536 from alexanderConstantinescu/pr-115204-followup

Browse Source 
[KCCM] service controller - #115204 follow-up
This commit is contained in:
Kubernetes Prow Robot 2023-03-14 17:44:33 -07:00 committed by GitHub
commit 52559dc6fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 344 additions and 1490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -943,6 +943,7 @@ var (
nodeUnTaintedPredicate, nodeUnTaintedPredicate,
} }
stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{ stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{
nodeNotDeletedPredicate,
nodeIncludedPredicate, nodeIncludedPredicate,
// This is not perfect, but probably good enough. We won't update the // This is not perfect, but probably good enough. We won't update the
// LBs just because the taint was added (see shouldSyncUpdatedNode) but // LBs just because the taint was added (see shouldSyncUpdatedNode) but
@ -989,6 +990,10 @@ func nodeReadyPredicate(node *v1.Node) bool {
return false return false
} }
func nodeNotDeletedPredicate(node *v1.Node) bool {
return node.DeletionTimestamp.IsZero()
}
// listWithPredicate gets nodes that matches all predicate functions. // listWithPredicate gets nodes that matches all predicate functions.
func listWithPredicates(nodeLister corelisters.NodeLister, predicates ...NodeConditionPredicate) ([]*v1.Node, error) { func listWithPredicates(nodeLister corelisters.NodeLister, predicates ...NodeConditionPredicate) ([]*v1.Node, error) {
nodes, err := nodeLister.List(labels.Everything()) nodes, err := nodeLister.List(labels.Everything())

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

File diff suppressed because it is too large Load Diff