From d2e6480bb177dcc8c31f6b1cb46f7771d53ecd65 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 14 Oct 2017 20:09:35 -0400 Subject: [PATCH] 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. --- cmd/kubeadm/app/constants/BUILD | 1 - cmd/kubeadm/app/constants/constants.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/constants/BUILD b/cmd/kubeadm/app/constants/BUILD index 4176128bb49..1e7597d46fa 100644 --- a/cmd/kubeadm/app/constants/BUILD +++ b/cmd/kubeadm/app/constants/BUILD @@ -10,7 +10,6 @@ go_library( name = "go_default_library", srcs = ["constants.go"], deps = [ - "//pkg/controller/service:go_default_library", "//pkg/util/version:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", ], diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 6ffa35ad0e9..4bdf31e974f 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -24,7 +24,6 @@ import ( "time" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/controller/service" "k8s.io/kubernetes/pkg/util/version" ) @@ -132,7 +131,8 @@ const ( DefaultTokenDuration = 24 * time.Hour // 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 = "kubeadm-config"