diff --git a/cmd/kube-aggregator/pkg/cmd/server/BUILD b/cmd/kube-aggregator/pkg/cmd/server/BUILD index 69137f87da3..fbc820e95df 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/BUILD +++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/generic/registry:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//vendor:github.com/pborman/uuid", "//vendor:github.com/spf13/cobra", @@ -28,6 +27,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/server/filters", + "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", ], diff --git a/cmd/kube-aggregator/pkg/cmd/server/start.go b/cmd/kube-aggregator/pkg/cmd/server/start.go index 6b3211f3415..e6d933056f6 100644 --- a/cmd/kube-aggregator/pkg/cmd/server/start.go +++ b/cmd/kube-aggregator/pkg/cmd/server/start.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/filters" + genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver" @@ -37,7 +38,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index bbc3432dc3f..24230507c5a 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -19,12 +19,12 @@ go_library( "//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", "//pkg/master/ports:go_default_library", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/server/options", ], ) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 3667d0d9ffc..78cca364a67 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -22,9 +22,9 @@ import ( "time" utilnet "k8s.io/apimachinery/pkg/util/net" + genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index 27fb4b7c8ee..c705c82b706 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -19,12 +19,12 @@ go_library( "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 06c1aa30e45..91f2519a956 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apiserver/pkg/authorization/authorizerfactory" + genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" @@ -29,7 +30,6 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" // Install the testgroup API diff --git a/federation/cmd/federation-apiserver/app/options/BUILD b/federation/cmd/federation-apiserver/app/options/BUILD index 67cff03421c..d3c15196275 100644 --- a/federation/cmd/federation-apiserver/app/options/BUILD +++ b/federation/cmd/federation-apiserver/app/options/BUILD @@ -16,9 +16,9 @@ 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", + "//vendor:k8s.io/apiserver/pkg/server/options", ], ) diff --git a/federation/cmd/federation-apiserver/app/options/options.go b/federation/cmd/federation-apiserver/app/options/options.go index fbfc13d82f6..b719b1a842d 100644 --- a/federation/cmd/federation-apiserver/app/options/options.go +++ b/federation/cmd/federation-apiserver/app/options/options.go @@ -20,7 +20,7 @@ package options import ( "time" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" + genericoptions "k8s.io/apiserver/pkg/server/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" // add the kubernetes feature gates diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index aaa8b353b54..d570d7347a3 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -25,7 +25,6 @@ go_test( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/genericapiserver/server/options:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//vendor:github.com/go-openapi/spec", "//vendor:github.com/stretchr/testify/assert", @@ -41,6 +40,7 @@ go_test( "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/flag", "//vendor:k8s.io/client-go/util/cert", @@ -70,7 +70,6 @@ go_library( "//pkg/genericapiserver/endpoints/openapi:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server/mux:go_default_library", - "//pkg/genericapiserver/server/options:go_default_library", "//pkg/genericapiserver/server/routes:go_default_library", "//vendor:github.com/coreos/go-systemd/daemon", "//vendor:github.com/emicklei/go-restful", @@ -102,6 +101,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/server/filters", "//vendor:k8s.io/apiserver/pkg/server/healthz", + "//vendor:k8s.io/apiserver/pkg/server/options", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/cert", @@ -121,7 +121,6 @@ filegroup( ":package-srcs", "//pkg/genericapiserver/server/mux:all-srcs", "//pkg/genericapiserver/server/openapi:all-srcs", - "//pkg/genericapiserver/server/options:all-srcs", "//pkg/genericapiserver/server/routes:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/genericapiserver/server/config.go b/pkg/genericapiserver/server/config.go index a2c9fe6d3b6..5bb76d1910d 100644 --- a/pkg/genericapiserver/server/config.go +++ b/pkg/genericapiserver/server/config.go @@ -52,13 +52,13 @@ import ( apirequest "k8s.io/apiserver/pkg/endpoints/request" genericfilters "k8s.io/apiserver/pkg/server/filters" "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/server/options" restclient "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/api" genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters" apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi" "k8s.io/kubernetes/pkg/genericapiserver/server/mux" - "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/genericapiserver/server/routes" ) diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD deleted file mode 100644 index acbb0902719..00000000000 --- a/pkg/genericapiserver/server/options/BUILD +++ /dev/null @@ -1,52 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "authentication.go", - "authorization.go", - "doc.go", - "etcd.go", - "server_run_options.go", - "serving.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/golang/glog", - "//vendor:github.com/spf13/pflag", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/admission", - "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", - "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", - "//vendor:k8s.io/apiserver/pkg/features", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - "//vendor:k8s.io/apiserver/pkg/util/feature", - "//vendor:k8s.io/apiserver/pkg/util/flag", - "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", - "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", - "//vendor:k8s.io/client-go/rest", - "//vendor:k8s.io/client-go/tools/clientcmd", - "//vendor:k8s.io/client-go/util/cert", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/genericapiserver/server/serve_test.go b/pkg/genericapiserver/server/serve_test.go index 17a41998146..7442fbeb171 100644 --- a/pkg/genericapiserver/server/serve_test.go +++ b/pkg/genericapiserver/server/serve_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/assert" + "k8s.io/apiserver/pkg/server/options" utilflag "k8s.io/apiserver/pkg/util/flag" utilcert "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - "k8s.io/kubernetes/pkg/genericapiserver/server/options" ) type TestCertSpec struct { diff --git a/pkg/genericapiserver/server/storage_factory_test.go b/pkg/genericapiserver/server/storage_factory_test.go index c2a95c1957f..cd34dbe2dd0 100644 --- a/pkg/genericapiserver/server/storage_factory_test.go +++ b/pkg/genericapiserver/server/storage_factory_test.go @@ -21,10 +21,10 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/genericapiserver/server/options" ) func TestUpdateEtcdOverrides(t *testing.T) { diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 598571c1270..98fc6ee33e7 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -23,12 +23,12 @@ go_library( "//pkg/cloudprovider:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/genericapiserver/server/options:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", "//pkg/kubeapiserver/authorizer:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apiserver/pkg/server/options", ], ) diff --git a/pkg/kubeapiserver/options/authentication.go b/pkg/kubeapiserver/options/authentication.go index c5bdf0e8e2a..37077dba4a3 100644 --- a/pkg/kubeapiserver/options/authentication.go +++ b/pkg/kubeapiserver/options/authentication.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "github.com/spf13/pflag" + genericoptions "k8s.io/apiserver/pkg/server/options" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" "k8s.io/kubernetes/pkg/kubeapiserver/authorizer" ) diff --git a/pkg/kubeapiserver/options/cloudprovider.go b/pkg/kubeapiserver/options/cloudprovider.go index 8f877b6555f..1e3f8a8c7dd 100644 --- a/pkg/kubeapiserver/options/cloudprovider.go +++ b/pkg/kubeapiserver/options/cloudprovider.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/pflag" + genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" - genericoptions "k8s.io/kubernetes/pkg/genericapiserver/server/options" ) type CloudProviderOptions struct { diff --git a/pkg/genericapiserver/server/options/OWNERS b/staging/src/k8s.io/apiserver/pkg/server/options/OWNERS similarity index 100% rename from pkg/genericapiserver/server/options/OWNERS rename to staging/src/k8s.io/apiserver/pkg/server/options/OWNERS diff --git a/pkg/genericapiserver/server/options/authentication.go b/staging/src/k8s.io/apiserver/pkg/server/options/authentication.go similarity index 100% rename from pkg/genericapiserver/server/options/authentication.go rename to staging/src/k8s.io/apiserver/pkg/server/options/authentication.go diff --git a/pkg/genericapiserver/server/options/authorization.go b/staging/src/k8s.io/apiserver/pkg/server/options/authorization.go similarity index 100% rename from pkg/genericapiserver/server/options/authorization.go rename to staging/src/k8s.io/apiserver/pkg/server/options/authorization.go diff --git a/pkg/genericapiserver/server/options/doc.go b/staging/src/k8s.io/apiserver/pkg/server/options/doc.go similarity index 91% rename from pkg/genericapiserver/server/options/doc.go rename to staging/src/k8s.io/apiserver/pkg/server/options/doc.go index dfe986fe0d9..426336be09a 100644 --- a/pkg/genericapiserver/server/options/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/doc.go @@ -18,4 +18,4 @@ limitations under the License. // server. It takes a minimal set of dependencies and does not reference // implementations, in order to ensure it may be reused by multiple components // (such as CLI commands that wish to generate or validate config). -package options // import "k8s.io/kubernetes/pkg/genericapiserver/server/options" +package options // import "k8s.io/apiserver/pkg/server/options" diff --git a/pkg/genericapiserver/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go similarity index 100% rename from pkg/genericapiserver/server/options/etcd.go rename to staging/src/k8s.io/apiserver/pkg/server/options/etcd.go diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go similarity index 100% rename from pkg/genericapiserver/server/options/server_run_options.go rename to staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go diff --git a/pkg/genericapiserver/server/options/serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go similarity index 100% rename from pkg/genericapiserver/server/options/serving.go rename to staging/src/k8s.io/apiserver/pkg/server/options/serving.go diff --git a/vendor/BUILD b/vendor/BUILD index 5f930a91153..8bea5b49310 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -14008,3 +14008,34 @@ go_library( srcs = ["k8s.io/apiserver/pkg/server/routes/data/swagger/datafile.go"], tags = ["automanaged"], ) + +go_library( + name = "k8s.io/apiserver/pkg/server/options", + srcs = [ + "k8s.io/apiserver/pkg/server/options/authentication.go", + "k8s.io/apiserver/pkg/server/options/authorization.go", + "k8s.io/apiserver/pkg/server/options/doc.go", + "k8s.io/apiserver/pkg/server/options/etcd.go", + "k8s.io/apiserver/pkg/server/options/server_run_options.go", + "k8s.io/apiserver/pkg/server/options/serving.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:github.com/spf13/pflag", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apiserver/pkg/admission", + "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", + "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/features", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/apiserver/pkg/util/feature", + "//vendor:k8s.io/apiserver/pkg/util/flag", + "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", + "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", + "//vendor:k8s.io/client-go/rest", + "//vendor:k8s.io/client-go/tools/clientcmd", + "//vendor:k8s.io/client-go/util/cert", + ], +)