Merge pull request #53937 from dims/duplicate-constant-in-kubeadm

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>. Duplicate a constant - LabelNodeRoleMaster **What this PR does / why we need it**: Per request from @luxas in 53458, to avoid cmd/kubeadm to depend on pkg/controller/service. Added a comment to make this clear. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #53937 from dims/duplicate-constant-in-kubeadm
b7862817 · Kubernetes Submit Queue · GitHub · d91e97f2 · d2e6480b · b7862817
Commit b7862817 authored Oct 17, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

BUILD cmd/kubeadm/app/constants/BUILD +0 -1

constants.go cmd/kubeadm/app/constants/constants.go +2 -2

No files found.
--- a/cmd/kubeadm/app/constants/BUILD
+++ b/cmd/kubeadm/app/constants/BUILD
@@ -11,7 +11,6 @@ go_library(
    srcs = ["constants.go"],
    importpath = "k8s.io/kubernetes/cmd/kubeadm/app/constants",
    deps = [
-        "//pkg/controller/service:go_default_library",
        "//pkg/util/version:go_default_library",
        "//vendor/k8s.io/api/core/v1:go_default_library",
    ],

--- 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"