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

Merge pull request #82855 from yutedz/alpha-node-role

Browse Source 
Defer the removal of labelAlphaNodeRoleExcludeBalancer to 1.18
This commit is contained in:
Kubernetes Prow Robot 2019-09-25 23:59:19 -07:00 committed by GitHub
commit 37c3a4da97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/service/service_controller.go
View File

@ -72,7 +72,7 @@ const (
// labelAlphaNodeRoleExcludeBalancer specifies that the node should be // labelAlphaNodeRoleExcludeBalancer specifies that the node should be
// exclude from load balancers created by a cloud provider. This label is deprecated and will // exclude from load balancers created by a cloud provider. This label is deprecated and will
// be removed in 1.17. // be removed in 1.18.
labelAlphaNodeRoleExcludeBalancer = "alpha.service-controller.kubernetes.io/exclude-balancer" labelAlphaNodeRoleExcludeBalancer = "alpha.service-controller.kubernetes.io/exclude-balancer"
// serviceNodeExclusionFeature is the feature gate name that // serviceNodeExclusionFeature is the feature gate name that
@ -647,7 +647,7 @@ func getNodeConditionPredicate() corelisters.NodeConditionPredicate {
} }
} }
if utilfeature.DefaultFeatureGate.Enabled(serviceNodeExclusionFeature) { if utilfeature.DefaultFeatureGate.Enabled(serviceNodeExclusionFeature) {
// Will be removed in 1.17 // Will be removed in 1.18
if _, hasExcludeBalancerLabel := node.Labels[labelAlphaNodeRoleExcludeBalancer]; hasExcludeBalancerLabel { if _, hasExcludeBalancerLabel := node.Labels[labelAlphaNodeRoleExcludeBalancer]; hasExcludeBalancerLabel {
return false return false
} }