From b511741df76a7bf31683361999915c5e74eefcbe Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:53:05 -0500 Subject: [PATCH] remove pkg/feature dependency from genericapiserver. --- cmd/kube-apiserver/app/options/BUILD | 1 + cmd/kube-apiserver/app/options/options.go | 3 +++ federation/cmd/federation-apiserver/app/options/BUILD | 1 + federation/cmd/federation-apiserver/app/options/options.go | 3 +++ pkg/genericapiserver/server/options/BUILD | 1 - pkg/genericapiserver/server/options/server_run_options.go | 3 --- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index 2437577c58a..bbc3432dc3f 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -18,6 +18,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/features:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 0b380143b5b..4f7dc8ec749 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -29,6 +29,9 @@ import ( kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" + // add the kubernetes feature gates + _ "k8s.io/kubernetes/pkg/features" + "github.com/spf13/pflag" ) diff --git a/federation/cmd/federation-apiserver/app/options/BUILD b/federation/cmd/federation-apiserver/app/options/BUILD index f5e88f117ff..67cff03421c 100644 --- a/federation/cmd/federation-apiserver/app/options/BUILD +++ b/federation/cmd/federation-apiserver/app/options/BUILD @@ -15,6 +15,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//pkg/features:go_default_library", "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//vendor:github.com/spf13/pflag", diff --git a/federation/cmd/federation-apiserver/app/options/options.go b/federation/cmd/federation-apiserver/app/options/options.go index 0908e0c5448..634f72675df 100644 --- a/federation/cmd/federation-apiserver/app/options/options.go +++ b/federation/cmd/federation-apiserver/app/options/options.go @@ -23,6 +23,9 @@ import ( genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" + // add the kubernetes feature gates + _ "k8s.io/kubernetes/pkg/features" + "github.com/spf13/pflag" ) diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD index 022f6123c9b..0b2cb979d37 100644 --- a/pkg/genericapiserver/server/options/BUILD +++ b/pkg/genericapiserver/server/options/BUILD @@ -20,7 +20,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/features:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go index c69fca1038d..a0a338815b0 100644 --- a/pkg/genericapiserver/server/options/server_run_options.go +++ b/pkg/genericapiserver/server/options/server_run_options.go @@ -28,9 +28,6 @@ import ( utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" - // add the kubernetes feature gates - _ "k8s.io/kubernetes/pkg/features" - "github.com/spf13/pflag" )