github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

remove pkg/feature dependency from genericapiserver.

Browse Source
This commit is contained in:
deads2k 2017-01-26 14:53:05 -05:00
parent 5b75980c32
commit b511741df7
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-apiserver/app/options/BUILD
View File

@ -18,6 +18,7 @@ go_library(
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/api/validation:go_default_library", "//pkg/api/validation:go_default_library",
"//pkg/features:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library", "//pkg/genericapiserver/server/options:go_default_library",
"//pkg/kubeapiserver/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library",
"//pkg/kubelet/client:go_default_library", "//pkg/kubelet/client:go_default_library",

3
cmd/kube-apiserver/app/options/options.go
View File

@ -29,6 +29,9 @@ import (
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/master/ports"
// add the kubernetes feature gates
_ "k8s.io/kubernetes/pkg/features"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )

1
federation/cmd/federation-apiserver/app/options/BUILD
View File

@ -15,6 +15,7 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/features:go_default_library",
"//pkg/genericapiserver/server/options:go_default_library", "//pkg/genericapiserver/server/options:go_default_library",
"//pkg/kubeapiserver/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library",
"//vendor:github.com/spf13/pflag", "//vendor:github.com/spf13/pflag",

3
federation/cmd/federation-apiserver/app/options/options.go
View File

@ -23,6 +23,9 @@ import (
genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options"
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
// add the kubernetes feature gates
_ "k8s.io/kubernetes/pkg/features"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )

1
pkg/genericapiserver/server/options/BUILD
View File

@ -20,7 +20,6 @@ go_library(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/features:go_default_library",
"//pkg/storage/storagebackend:go_default_library", "//pkg/storage/storagebackend:go_default_library",
"//vendor:github.com/golang/glog", "//vendor:github.com/golang/glog",
"//vendor:github.com/spf13/pflag", "//vendor:github.com/spf13/pflag",

3
pkg/genericapiserver/server/options/server_run_options.go
View File

@ -28,9 +28,6 @@ import (
utilflag "k8s.io/apiserver/pkg/util/flag" utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
// add the kubernetes feature gates
_ "k8s.io/kubernetes/pkg/features"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )