github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #53678 from brendandburns/node-label 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Append an alpha label to the exclude load balancer annotation.

There were concerns that this was not going through the alpha/beta process, so adding an `alpha` label.

@mikedanese @caseydavenport @jdumars
pull/6/head
Kubernetes Submit Queue 2017-10-10 18:35:42 -07:00 committed by GitHub
parent 77c8b6eadf 6916bb24a2
commit ca0607aaad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/constants/constants.go
View File

@ -136,7 +136,7 @@ const (
// LabelNodeRoleExcludeBalancer specifies that the node should be // LabelNodeRoleExcludeBalancer specifies that the node should be
// exclude from load balancers created by a cloud provider. // exclude from load balancers created by a cloud provider.
LabelNodeRoleExcludeBalancer = "node-role.kubernetes.io/exclude-balancer" LabelNodeRoleExcludeBalancer = "alpha.node-role.kubernetes.io/exclude-balancer"
// MasterConfigurationConfigMap specifies in what ConfigMap in the kube-system namespace the `kubeadm init` configuration should be stored // MasterConfigurationConfigMap specifies in what ConfigMap in the kube-system namespace the `kubeadm init` configuration should be stored
MasterConfigurationConfigMap = "kubeadm-config" MasterConfigurationConfigMap = "kubeadm-config"