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/hack/build-ui.sh b/hack/build-ui.sh index c084f554b13..6e2e0e5d539 100755 --- a/hack/build-ui.sh +++ b/hack/build-ui.sh @@ -37,7 +37,7 @@ readonly SWAGGER_PKG="swagger" function kube::hack::build_ui() { local pkg="$1" local src="$2" - local output_file="pkg/genericapiserver/server/routes/data/${pkg}/datafile.go" + local output_file="staging/src/k8s.io/apiserver/pkg/server/routes/data/${pkg}/datafile.go" go-bindata -nocompress -o "${output_file}" -prefix ${PWD} -pkg "${pkg}" "${src}" 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/routes/BUILD b/pkg/genericapiserver/server/routes/BUILD index 21e8f8068ef..d597a9dec3d 100644 --- a/pkg/genericapiserver/server/routes/BUILD +++ b/pkg/genericapiserver/server/routes/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/server/mux:go_default_library", "//pkg/genericapiserver/server/openapi:go_default_library", - "//pkg/genericapiserver/server/routes/data/swagger:go_default_library", "//vendor:github.com/elazarl/go-bindata-assetfs", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/emicklei/go-restful/swagger", @@ -34,6 +33,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/openapi", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", + "//vendor:k8s.io/apiserver/pkg/server/routes/data/swagger", "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", ], ) @@ -47,9 +47,6 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/genericapiserver/server/routes/data/swagger:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], ) diff --git a/pkg/genericapiserver/server/routes/data/swagger/BUILD b/pkg/genericapiserver/server/routes/data/swagger/BUILD deleted file mode 100644 index 785a73744d3..00000000000 --- a/pkg/genericapiserver/server/routes/data/swagger/BUILD +++ /dev/null @@ -1,27 +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 = ["datafile.go"], - tags = ["automanaged"], -) - -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/routes/swaggerui.go b/pkg/genericapiserver/server/routes/swaggerui.go index 0b7f252c325..8acbc624321 100644 --- a/pkg/genericapiserver/server/routes/swaggerui.go +++ b/pkg/genericapiserver/server/routes/swaggerui.go @@ -21,8 +21,8 @@ import ( assetfs "github.com/elazarl/go-bindata-assetfs" + "k8s.io/apiserver/pkg/server/routes/data/swagger" "k8s.io/kubernetes/pkg/genericapiserver/server/mux" - "k8s.io/kubernetes/pkg/genericapiserver/server/routes/data/swagger" ) // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui. 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/pkg/genericapiserver/server/routes/data/README.md b/staging/src/k8s.io/apiserver/pkg/server/routes/data/README.md similarity index 100% rename from pkg/genericapiserver/server/routes/data/README.md rename to staging/src/k8s.io/apiserver/pkg/server/routes/data/README.md diff --git a/pkg/genericapiserver/server/routes/data/swagger/datafile.go b/staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger/datafile.go similarity index 99% rename from pkg/genericapiserver/server/routes/data/swagger/datafile.go rename to staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger/datafile.go index 0bb8bab3bb7..a8ae83ddb9a 100644 --- a/pkg/genericapiserver/server/routes/data/swagger/datafile.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger/datafile.go @@ -1,5 +1,5 @@ /* -Copyright 2016 The Kubernetes Authors. +Copyright 2017 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -124,7 +124,7 @@ func third_partySwaggerUiLicense() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/LICENSE", size: 596, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/LICENSE", size: 596, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -165,7 +165,7 @@ func third_partySwaggerUiReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/README.md", size: 1032, mode: os.FileMode(420), modTime: time.Unix(1467377779, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/README.md", size: 1032, mode: os.FileMode(436), modTime: time.Unix(1463153383, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -307,7 +307,7 @@ func third_partySwaggerUiCssResetCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/css/reset.css", size: 1066, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/css/reset.css", size: 1066, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1580,7 +1580,7 @@ func third_partySwaggerUiCssScreenCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/css/screen.css", size: 43042, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/css/screen.css", size: 43042, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1623,7 +1623,7 @@ func third_partySwaggerUiCssTypographyCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/css/typography.css", size: 1474, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/css/typography.css", size: 1474, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1640,7 +1640,7 @@ func third_partySwaggerUiFontsDroidSansV6Latin700Eot() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.eot", size: 22924, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.eot", size: 22924, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2068,7 +2068,7 @@ func third_partySwaggerUiFontsDroidSansV6Latin700Svg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.svg", size: 73575, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.svg", size: 73575, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2085,7 +2085,7 @@ func third_partySwaggerUiFontsDroidSansV6Latin700Ttf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.ttf", size: 40516, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.ttf", size: 40516, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2102,7 +2102,7 @@ func third_partySwaggerUiFontsDroidSansV6Latin700Woff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.woff", size: 25992, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.woff", size: 25992, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2119,7 +2119,7 @@ func third_partySwaggerUiFontsDroidSansV6Latin700Woff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.woff2", size: 11480, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-700.woff2", size: 11480, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2136,7 +2136,7 @@ func third_partySwaggerUiFontsDroidSansV6LatinRegularEot() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.eot", size: 22008, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.eot", size: 22008, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2556,7 +2556,7 @@ func third_partySwaggerUiFontsDroidSansV6LatinRegularSvg() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.svg", size: 72148, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.svg", size: 72148, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2573,7 +2573,7 @@ func third_partySwaggerUiFontsDroidSansV6LatinRegularTtf() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf", size: 39072, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf", size: 39072, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2590,7 +2590,7 @@ func third_partySwaggerUiFontsDroidSansV6LatinRegularWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.woff", size: 24868, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.woff", size: 24868, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2607,7 +2607,7 @@ func third_partySwaggerUiFontsDroidSansV6LatinRegularWoff2() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2", size: 11304, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2", size: 11304, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2624,7 +2624,7 @@ func third_partySwaggerUiImagesExplorer_iconsPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/images/explorer_icons.png", size: 5763, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/images/explorer_icons.png", size: 5763, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2641,7 +2641,7 @@ func third_partySwaggerUiImagesLogo_smallPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/images/logo_small.png", size: 770, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/images/logo_small.png", size: 770, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2658,7 +2658,7 @@ func third_partySwaggerUiImagesPet_store_apiPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/images/pet_store_api.png", size: 824, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/images/pet_store_api.png", size: 824, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2675,7 +2675,7 @@ func third_partySwaggerUiImagesThrobberGif() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/images/throbber.gif", size: 9257, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/images/throbber.gif", size: 9257, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2692,7 +2692,7 @@ func third_partySwaggerUiImagesWordnik_apiPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/images/wordnik_api.png", size: 980, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/images/wordnik_api.png", size: 980, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2802,7 +2802,7 @@ func third_partySwaggerUiIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/index.html", size: 3561, mode: os.FileMode(420), modTime: time.Unix(1467377779, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/index.html", size: 3561, mode: os.FileMode(436), modTime: time.Unix(1468871087, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2833,7 +2833,7 @@ func third_partySwaggerUiLibBackboneMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/backbone-min.js", size: 20390, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/backbone-min.js", size: 20390, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5128,7 +5128,7 @@ func third_partySwaggerUiLibHandlebars100Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/handlebars-1.0.0.js", size: 72766, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/handlebars-1.0.0.js", size: 72766, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5172,7 +5172,7 @@ func third_partySwaggerUiLibHandlebars200Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/handlebars-2.0.0.js", size: 48517, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/handlebars-2.0.0.js", size: 48517, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5189,7 +5189,7 @@ func third_partySwaggerUiLibHighlight73PackJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/highlight.7.3.pack.js", size: 7499, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/highlight.7.3.pack.js", size: 7499, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5207,7 +5207,7 @@ func third_partySwaggerUiLibJquery180MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery-1.8.0.min.js", size: 92556, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery-1.8.0.min.js", size: 92556, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5241,7 +5241,7 @@ func third_partySwaggerUiLibJqueryBaBbqMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.ba-bbq.min.js", size: 4119, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.ba-bbq.min.js", size: 4119, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5259,7 +5259,7 @@ func third_partySwaggerUiLibJquerySlidetoMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.slideto.min.js", size: 369, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.slideto.min.js", size: 369, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5283,7 +5283,7 @@ func third_partySwaggerUiLibJqueryWiggleMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.wiggle.min.js", size: 762, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/jquery.wiggle.min.js", size: 762, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -6571,7 +6571,7 @@ func third_partySwaggerUiLibMarkedJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/marked.js", size: 28156, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/marked.js", size: 28156, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -6780,7 +6780,7 @@ func third_partySwaggerUiLibShredContentJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/shred/content.js", size: 6862, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/shred/content.js", size: 6862, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -9561,7 +9561,7 @@ func third_partySwaggerUiLibShredBundleJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/shred.bundle.js", size: 88050, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/shred.bundle.js", size: 88050, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -12509,7 +12509,7 @@ func third_partySwaggerUiLibSwaggerClientJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger-client.js", size: 86354, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger-client.js", size: 86354, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -12800,7 +12800,7 @@ func third_partySwaggerUiLibSwaggerOauthJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger-oauth.js", size: 8580, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger-oauth.js", size: 8580, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -14512,7 +14512,7 @@ func third_partySwaggerUiLibSwaggerJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger.js", size: 53321, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/swagger.js", size: 53321, mode: os.FileMode(436), modTime: time.Unix(1421093375, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -14534,7 +14534,7 @@ func third_partySwaggerUiLibUnderscoreMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/lib/underscore-min.js", size: 15626, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/lib/underscore-min.js", size: 15626, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -14570,7 +14570,7 @@ func third_partySwaggerUiO2cHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/o2c.html", size: 449, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/o2c.html", size: 449, mode: os.FileMode(436), modTime: time.Unix(1425500581, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -16827,7 +16827,7 @@ func third_partySwaggerUiSwaggerUiJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/swagger-ui.js", size: 110246, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/swagger-ui.js", size: 110246, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -16845,7 +16845,7 @@ func third_partySwaggerUiSwaggerUiMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "third_party/swagger-ui/swagger-ui.min.js", size: 63466, mode: os.FileMode(420), modTime: time.Unix(1463989219, 0)} + info := bindataFileInfo{name: "third_party/swagger-ui/swagger-ui.min.js", size: 63466, mode: os.FileMode(436), modTime: time.Unix(1441894315, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/vendor/BUILD b/vendor/BUILD index a8a24bbbe5e..8bea5b49310 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -14002,3 +14002,40 @@ go_library( "//vendor:k8s.io/client-go/util/clock", ], ) + +go_library( + name = "k8s.io/apiserver/pkg/server/routes/data/swagger", + 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", + ], +)