From fd8f2bd91f25d1ef6a0026fe8f216d70e21c96c1 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Thu, 19 Sep 2019 12:06:55 -0700 Subject: [PATCH] Defer the removal of labelAlphaNodeRoleExcludeBalancer to 1.18 --- pkg/controller/service/service_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index 3e24e387d10..e32a4c45326 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -72,7 +72,7 @@ const ( // labelAlphaNodeRoleExcludeBalancer specifies that the node should be // 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" // serviceNodeExclusionFeature is the feature gate name that @@ -647,7 +647,7 @@ func getNodeConditionPredicate() corelisters.NodeConditionPredicate { } } if utilfeature.DefaultFeatureGate.Enabled(serviceNodeExclusionFeature) { - // Will be removed in 1.17 + // Will be removed in 1.18 if _, hasExcludeBalancerLabel := node.Labels[labelAlphaNodeRoleExcludeBalancer]; hasExcludeBalancerLabel { return false }