From 35f3f82029d58a38b21d3859745c363aad1a5a1a Mon Sep 17 00:00:00 2001 From: SataQiu <1527062125@qq.com> Date: Sun, 12 Apr 2020 15:05:44 +0800 Subject: [PATCH] kubeadm: remove the dependence on /pkg/features Signed-off-by: SataQiu <1527062125@qq.com> --- cmd/kubeadm/app/phases/controlplane/BUILD | 2 +- cmd/kubeadm/app/phases/controlplane/manifests_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/phases/controlplane/BUILD b/cmd/kubeadm/app/phases/controlplane/BUILD index e59a8350258..5438e9e1583 100644 --- a/cmd/kubeadm/app/phases/controlplane/BUILD +++ b/cmd/kubeadm/app/phases/controlplane/BUILD @@ -16,10 +16,10 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", + "//cmd/kubeadm/app/features:go_default_library", "//cmd/kubeadm/app/phases/certs:go_default_library", "//cmd/kubeadm/app/util/staticpod:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//pkg/features:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/github.com/lithammer/dedent:go_default_library", diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index 4c7bf2419e1..b084ec10681 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - "k8s.io/kubernetes/pkg/features" ) const ( @@ -754,7 +754,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, CertificatesDir: testCertsDir, KubernetesVersion: cpVersion, - FeatureGates: map[string]bool{string(features.IPv6DualStack): true}, + FeatureGates: map[string]bool{features.IPv6DualStack: true}, }, expected: []string{ "kube-controller-manager", @@ -788,7 +788,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, CertificatesDir: testCertsDir, KubernetesVersion: cpVersion, - FeatureGates: map[string]bool{string(features.IPv6DualStack): true}, + FeatureGates: map[string]bool{features.IPv6DualStack: true}, }, expected: []string{ "kube-controller-manager",