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

Duplicate a constant - LabelNodeRoleMaster

Browse Source 
Per request from @luxas in 53458, to avoid cmd/kubeadm to
depend on pkg/controller/service. Added a comment to make
this clear.
This commit is contained in:
Davanum Srinivas 2017-10-14 20:09:35 -04:00
parent 0a72a8d1c6
commit d2e6480bb1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/constants/BUILD
View File

@ -10,7 +10,6 @@ go_library(
name = "go_default_library", name = "go_default_library",
srcs = ["constants.go"], srcs = ["constants.go"],
deps = [ deps = [
"//pkg/controller/service:go_default_library",
"//pkg/util/version:go_default_library", "//pkg/util/version:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
], ],

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

@ -24,7 +24,6 @@ import (
"time" "time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/controller/service"
"k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/pkg/util/version"
) )
@ -132,7 +131,8 @@ const (
DefaultTokenDuration = 24 * time.Hour DefaultTokenDuration = 24 * time.Hour
// LabelNodeRoleMaster specifies that a node is a master // LabelNodeRoleMaster specifies that a node is a master
LabelNodeRoleMaster = service.LabelNodeRoleMaster // This is a duplicate definition of the constant in pkg/controller/service/service_controller.go
LabelNodeRoleMaster = "node-role.kubernetes.io/master"
// 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"