Skip to content

K
k3s
Commit d2e6480b authored by Davanum Srinivas's avatar Davanum Srinivas
Browse files
Options

Duplicate a constant - LabelNodeRoleMaster

Per request from @luxas in 53458, to avoid cmd/kubeadm to depend on pkg/controller/service. Added a comment to make this clear.
parent 0a72a8d1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
cmd/kubeadm/app/constants/BUILD
View file @ d2e6480b
...@@ -10,7 +10,6 @@ go_library( ...@@ -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",
], ],
......
cmd/kubeadm/app/constants/constants.go
View file @ d2e6480b
...@@ -24,7 +24,6 @@ import ( ...@@ -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 ( ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment