Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename labelNodeRoleExcludeBalancer to labelNodeExcludeBalancers #97767

Merged
merged 6 commits into from Feb 18, 2021
Merged

Rename labelNodeRoleExcludeBalancer to labelNodeExcludeBalancers #97767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01dd089
Rename labelNodeRoleExcludeBalancer to labelNodeExcludeBalancers
edsoncelio Jan 6, 2021
3b2b41b
Move labelNodeExcludeBalancers to well_known_labels
edsoncelio Jan 7, 2021
21810ea
Rename labelNodeExcludeBalancers to LabelNodeExcludeBalancers
edsoncelio Jan 7, 2021
2b71add
Fix LabelNodeExcludeBalancers reference
edsoncelio Jan 7, 2021
423d6e2
Fix extra space on well_known_labels
edsoncelio Jan 7, 2021
d7c6c7f
Rename commentary to match with the code name
edsoncelio Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions staging/src/k8s.io/api/core/v1/well_known_labels.go
View file
Open in desktop
Expand Up @@ -58,4 +58,11 @@ const (
// controllers and kube-proxy to check if the Endpoint objects should be replicated when
// using Headless Services
IsHeadlessService = "service.kubernetes.io/headless"

// LabelNodeExcludeBalancers specifies that the node should not be considered as a target
// for external load-balancers which use nodes as a second hop (e.g. many cloud LBs which only
// understand nodes). For services that use externalTrafficPolicy=Local, this may mean that
// any backends on excluded nodes are not reachable by those external load-balancers.
// Implementations of this exclusion may vary based on provider.
LabelNodeExcludeBalancers = "node.kubernetes.io/exclude-from-external-load-balancers"
)
9 changes: 1 addition & 8 deletions staging/src/k8s.io/cloud-provider/controllers/service/controller.go
View file
Open in desktop
Expand Up @@ -55,13 +55,6 @@ const (
// should be changed appropriately.
minRetryDelay = 5 * time.Second
maxRetryDelay = 300 * time.Second

// labelNodeRoleExcludeBalancer specifies that the node should not be considered as a target
// for external load-balancers which use nodes as a second hop (e.g. many cloud LBs which only
// understand nodes). For services that use externalTrafficPolicy=Local, this may mean that
// any backends on excluded nodes are not reachable by those external load-balancers.
// Implementations of this exclusion may vary based on provider.
labelNodeRoleExcludeBalancer = "node.kubernetes.io/exclude-from-external-load-balancers"
)

type cachedService struct {
Expand Down Expand Up @@ -614,7 +607,7 @@ func nodeSlicesEqualForLB(x, y []*v1.Node) bool {

func (s *Controller) getNodeConditionPredicate() NodeConditionPredicate {
return func(node *v1.Node) bool {
if _, hasExcludeBalancerLabel := node.Labels[labelNodeRoleExcludeBalancer]; hasExcludeBalancerLabel {
if _, hasExcludeBalancerLabel := node.Labels[v1.LabelNodeExcludeBalancers]; hasExcludeBalancerLabel {
return false
}

Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go
View file
Open in desktop
Expand Up @@ -1382,7 +1382,7 @@ func Test_getNodeConditionPredicate(t *testing.T) {
{want: true, input: &v1.Node{Spec: v1.NodeSpec{Unschedulable: true}, Status: v1.NodeStatus{Conditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionTrue}}}}},

{want: true, input: &v1.Node{Status: validNodeStatus, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{}}}},
{want: false, input: &v1.Node{Status: validNodeStatus, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{labelNodeRoleExcludeBalancer: ""}}}},
{want: false, input: &v1.Node{Status: validNodeStatus, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{v1.LabelNodeExcludeBalancers: ""}}}},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down Expand Up @@ -1498,7 +1498,7 @@ func Test_shouldSyncNode(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "node",
Labels: map[string]string{
labelNodeRoleExcludeBalancer: "",
v1.LabelNodeExcludeBalancers: "",
},
},
},
Expand Down