github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

move apiserver options

Browse Source
This commit is contained in:
deads2k 2017-02-01 09:39:32 -05:00
parent 9597cb150d
commit 6b57489552
24 changed files with 48 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-aggregator/pkg/cmd/server/BUILD
View File

@ -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",
],

2
cmd/kube-aggregator/pkg/cmd/server/start.go
View File

@ -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"

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

@ -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",
],
)

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

@ -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"

2
examples/apiserver/BUILD
View File

@ -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",
],
)

2
examples/apiserver/apiserver.go
View File

@ -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

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

@ -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",
],
)

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

@ -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

5
pkg/genericapiserver/server/BUILD
View File

@ -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"],

2
pkg/genericapiserver/server/config.go
View File

@ -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"
)

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

@ -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"],
)

2
pkg/genericapiserver/server/serve_test.go
View File

@ -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 {

2
pkg/genericapiserver/server/storage_factory_test.go
View File

@ -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) {

2
pkg/kubeapiserver/options/BUILD
View File

@ -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",
],
)

2
pkg/kubeapiserver/options/authentication.go
View File

@ -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"
)

2
pkg/kubeapiserver/options/cloudprovider.go
View File

@ -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 {

0
pkg/genericapiserver/server/options/OWNERS → staging/src/k8s.io/apiserver/pkg/server/options/OWNERS
View File

0
pkg/genericapiserver/server/options/authentication.go → staging/src/k8s.io/apiserver/pkg/server/options/authentication.go
View File

0
pkg/genericapiserver/server/options/authorization.go → staging/src/k8s.io/apiserver/pkg/server/options/authorization.go
View File

2
pkg/genericapiserver/server/options/doc.go → staging/src/k8s.io/apiserver/pkg/server/options/doc.go
View File

@ -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"

0
pkg/genericapiserver/server/options/etcd.go → staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
View File

0
pkg/genericapiserver/server/options/server_run_options.go → staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go
View File

0
pkg/genericapiserver/server/options/serving.go → staging/src/k8s.io/apiserver/pkg/server/options/serving.go
View File

31
vendor/BUILD vendored
View File

@ -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",
],
)