From 82826ec2737870a0c7d5a5bcef5faffe0c11580f Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 23 Jan 2017 15:46:05 +0100 Subject: [PATCH] pkg/util/flag: move to k8s.io/apiserver --- cmd/cloud-controller-manager/controller-manager.go | 2 +- cmd/hyperkube/hyperkube.go | 2 +- cmd/hyperkube/server.go | 2 +- cmd/kube-apiserver/apiserver.go | 2 +- cmd/kube-controller-manager/controller-manager.go | 2 +- cmd/kube-proxy/proxy.go | 2 +- cmd/kubeadm/app/cmd/cmd.go | 2 +- cmd/kubelet/app/options/options.go | 4 ++-- cmd/kubelet/app/server_test.go | 2 +- cmd/kubelet/kubelet.go | 2 +- cmd/kubemark/hollow-node.go | 2 +- examples/apiserver/server/main.go | 2 +- federation/cmd/federation-apiserver/apiserver.go | 2 +- .../federation-controller-manager/app/controllermanager.go | 2 +- .../app/controllermanager_test.go | 2 +- .../federation-controller-manager/app/options/options.go | 2 +- .../cmd/federation-controller-manager/controller-manager.go | 2 +- federation/pkg/kubefed/kubefed.go | 2 +- pkg/apis/componentconfig/types.go | 2 +- pkg/genericapiserver/server/options/server_run_options.go | 2 +- pkg/genericapiserver/server/options/serving.go | 2 +- pkg/genericapiserver/server/serve_test.go | 6 +++--- pkg/kubeapiserver/default_storage_factory_builder.go | 2 +- pkg/kubectl/cmd/cmd.go | 2 +- pkg/kubectl/cmd/config/create_authinfo.go | 2 +- pkg/kubectl/cmd/config/create_authinfo_test.go | 2 +- pkg/kubectl/cmd/config/create_cluster.go | 2 +- pkg/kubectl/cmd/config/create_context.go | 2 +- pkg/kubectl/cmd/config/set.go | 2 +- pkg/kubectl/cmd/config/view.go | 2 +- pkg/kubectl/cmd/util/factory_client_access.go | 2 +- pkg/kubectl/cmd/util/factory_test.go | 2 +- pkg/kubelet/kubelet.go | 2 +- plugin/cmd/kube-scheduler/scheduler.go | 2 +- {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/BUILD | 0 .../k8s.io/apiserver/pkg}/util/flag/configuration_map.go | 0 .../src/k8s.io/apiserver/pkg}/util/flag/flags.go | 0 .../k8s.io/apiserver/pkg}/util/flag/namedcertkey_flag.go | 0 .../apiserver/pkg}/util/flag/namedcertkey_flag_test.go | 0 .../src/k8s.io/apiserver/pkg}/util/flag/string_flag.go | 0 .../src/k8s.io/apiserver/pkg}/util/flag/tristate.go | 0 41 files changed, 37 insertions(+), 37 deletions(-) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/BUILD (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/configuration_map.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/flags.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/namedcertkey_flag.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/namedcertkey_flag_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/string_flag.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/flag/tristate.go (100%) diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index 7cd7a4c74b7..c709a0e9bd4 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -24,12 +24,12 @@ import ( "os" "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration "k8s.io/kubernetes/pkg/cloudprovider" _ "k8s.io/kubernetes/pkg/cloudprovider/providers" - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration "k8s.io/kubernetes/pkg/version/verflag" diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go index ef64d9b8523..fee06bad81c 100644 --- a/cmd/hyperkube/hyperkube.go +++ b/cmd/hyperkube/hyperkube.go @@ -25,8 +25,8 @@ import ( "os" "path" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/util" - utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" diff --git a/cmd/hyperkube/server.go b/cmd/hyperkube/server.go index e315d85bd88..9abafcd638d 100644 --- a/cmd/hyperkube/server.go +++ b/cmd/hyperkube/server.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "strings" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go index 4b06d11363c..87c1e045202 100644 --- a/cmd/kube-apiserver/apiserver.go +++ b/cmd/kube-apiserver/apiserver.go @@ -24,10 +24,10 @@ import ( "os" "time" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration "k8s.io/kubernetes/pkg/version/verflag" diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index feff1f7094d..b6eac175e21 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -25,10 +25,10 @@ import ( "os" "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/kube-controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index a4702f1ff30..af94b4901e1 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -21,10 +21,10 @@ import ( "os" "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration "k8s.io/kubernetes/pkg/version/verflag" diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go index 48ee4118bdb..684bc9f1427 100644 --- a/cmd/kubeadm/app/cmd/cmd.go +++ b/cmd/kubeadm/app/cmd/cmd.go @@ -22,8 +22,8 @@ import ( "github.com/renstrom/dedent" "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cobra.Command { diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 7d3df84e7e4..ee77b118cd3 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -22,11 +22,11 @@ import ( "strings" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/apiserver/pkg/util/flag" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" - "k8s.io/kubernetes/pkg/util/flag" - utilflag "k8s.io/kubernetes/pkg/util/flag" utiltaints "k8s.io/kubernetes/pkg/util/taints" "github.com/spf13/pflag" diff --git a/cmd/kubelet/app/server_test.go b/cmd/kubelet/app/server_test.go index 71304f3e4fa..6b948e80d6f 100644 --- a/cmd/kubelet/app/server_test.go +++ b/cmd/kubelet/app/server_test.go @@ -19,8 +19,8 @@ package app import ( "testing" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/kubelet" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) func TestValueOfAllocatableResources(t *testing.T) { diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index a50a2e11660..466685712f4 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -24,10 +24,10 @@ import ( "fmt" "os" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/cmd/kubelet/app/options" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration "k8s.io/kubernetes/pkg/version/verflag" diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 42d2287e7ba..47e539ed997 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -20,6 +20,7 @@ import ( "fmt" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/apiserver/pkg/util/flag" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/pkg/api/v1" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubemark" proxyconfig "k8s.io/kubernetes/pkg/proxy/config" - "k8s.io/kubernetes/pkg/util/flag" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/examples/apiserver/server/main.go b/examples/apiserver/server/main.go index 7b164ff7853..1eb65c2ca65 100644 --- a/examples/apiserver/server/main.go +++ b/examples/apiserver/server/main.go @@ -18,8 +18,8 @@ package main import ( "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/examples/apiserver" - "k8s.io/kubernetes/pkg/util/flag" "github.com/golang/glog" "github.com/spf13/pflag" diff --git a/federation/cmd/federation-apiserver/apiserver.go b/federation/cmd/federation-apiserver/apiserver.go index 4fd5dcd9666..97f94dc0e57 100644 --- a/federation/cmd/federation-apiserver/apiserver.go +++ b/federation/cmd/federation-apiserver/apiserver.go @@ -24,9 +24,9 @@ import ( "os" "time" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index 2879781b43e..7b951c6d018 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -29,6 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/healthz" + utilflag "k8s.io/apiserver/pkg/util/flag" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" @@ -45,7 +46,6 @@ import ( servicecontroller "k8s.io/kubernetes/federation/pkg/federation-controller/service" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/util/configz" - utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/version" "github.com/golang/glog" diff --git a/federation/cmd/federation-controller-manager/app/controllermanager_test.go b/federation/cmd/federation-controller-manager/app/controllermanager_test.go index c7ded00197a..0d44fe709d2 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager_test.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager_test.go @@ -19,8 +19,8 @@ package app import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + utilflag "k8s.io/apiserver/pkg/util/flag" ingresscontroller "k8s.io/kubernetes/federation/pkg/federation-controller/ingress" - utilflag "k8s.io/kubernetes/pkg/util/flag" "testing" ) diff --git a/federation/cmd/federation-controller-manager/app/options/options.go b/federation/cmd/federation-controller-manager/app/options/options.go index 7ded0b38db1..ecfd4a5f5be 100644 --- a/federation/cmd/federation-controller-manager/app/options/options.go +++ b/federation/cmd/federation-controller-manager/app/options/options.go @@ -25,10 +25,10 @@ import ( "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) type ControllerManagerConfiguration struct { diff --git a/federation/cmd/federation-controller-manager/controller-manager.go b/federation/cmd/federation-controller-manager/controller-manager.go index 05f0de7cbb3..104f10b005d 100644 --- a/federation/cmd/federation-controller-manager/controller-manager.go +++ b/federation/cmd/federation-controller-manager/controller-manager.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/pflag" "k8s.io/apiserver/pkg/server/healthz" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration "k8s.io/kubernetes/pkg/version/verflag" diff --git a/federation/pkg/kubefed/kubefed.go b/federation/pkg/kubefed/kubefed.go index 9e0a40de540..6a719ff9ed8 100644 --- a/federation/pkg/kubefed/kubefed.go +++ b/federation/pkg/kubefed/kubefed.go @@ -19,13 +19,13 @@ package kubefed import ( "io" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" kubefedinit "k8s.io/kubernetes/federation/pkg/kubefed/init" "k8s.io/kubernetes/federation/pkg/kubefed/util" kubectl "k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/cobra" ) diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 04ba64149de..d76a82b43ba 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -19,8 +19,8 @@ package componentconfig import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) type KubeProxyConfiguration struct { diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go index d8e9245f439..c69fca1038d 100644 --- a/pkg/genericapiserver/server/options/server_run_options.go +++ b/pkg/genericapiserver/server/options/server_run_options.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" utilfeature "k8s.io/apiserver/pkg/util/feature" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" // add the kubernetes feature gates _ "k8s.io/kubernetes/pkg/features" - utilflag "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) diff --git a/pkg/genericapiserver/server/options/serving.go b/pkg/genericapiserver/server/options/serving.go index fabe42a0fec..e9f5722c22b 100644 --- a/pkg/genericapiserver/server/options/serving.go +++ b/pkg/genericapiserver/server/options/serving.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/pflag" utilnet "k8s.io/apimachinery/pkg/util/net" + utilflag "k8s.io/apiserver/pkg/util/flag" certutil "k8s.io/client-go/util/cert" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) type ServingOptions struct { diff --git a/pkg/genericapiserver/server/serve_test.go b/pkg/genericapiserver/server/serve_test.go index d7499e9b1ea..17a41998146 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" + 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" - "k8s.io/kubernetes/pkg/util/config" ) type TestCertSpec struct { @@ -420,7 +420,7 @@ NextTest: caCerts := []*x509.Certificate{ca} // create SNI certs - var namedCertKeys []config.NamedCertKey + var namedCertKeys []utilflag.NamedCertKey serverSig, err := certFileSignature(serverCertBundleFile, serverKeyFile) if err != nil { t.Errorf("%q - failed to get server cert signature: %v", title, err) @@ -436,7 +436,7 @@ NextTest: continue NextTest } - namedCertKeys = append(namedCertKeys, config.NamedCertKey{ + namedCertKeys = append(namedCertKeys, utilflag.NamedCertKey{ KeyFile: keyFile, CertFile: certBundleFile, Names: c.explicitNames, diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index b63fcd905d6..df26dba774f 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" "k8s.io/kubernetes/pkg/storage/storagebackend" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) // Builds the DefaultStorageFactory. diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 50368393561..b3bf021bf21 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -20,13 +20,13 @@ import ( "fmt" "io" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config" "k8s.io/kubernetes/pkg/kubectl/cmd/rollout" "k8s.io/kubernetes/pkg/kubectl/cmd/set" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/i18n" "github.com/golang/glog" diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/pkg/kubectl/cmd/config/create_authinfo.go index ba71a47cd29..41624689b6f 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) type createAuthInfoOptions struct { diff --git a/pkg/kubectl/cmd/config/create_authinfo_test.go b/pkg/kubectl/cmd/config/create_authinfo_test.go index bb10be356c8..1c8fa847647 100644 --- a/pkg/kubectl/cmd/config/create_authinfo_test.go +++ b/pkg/kubectl/cmd/config/create_authinfo_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/apiserver/pkg/util/flag" ) func stringFlagFor(s string) flag.StringFlag { diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index f08b28a4af3..2c11dc40ee9 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -25,11 +25,11 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) type createClusterOptions struct { diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index d7509cf9371..829a56a71e4 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) type createContextOptions struct { diff --git a/pkg/kubectl/cmd/config/set.go b/pkg/kubectl/cmd/config/set.go index 6b72cf2e8ff..5c74bc14286 100644 --- a/pkg/kubectl/cmd/config/set.go +++ b/pkg/kubectl/cmd/config/set.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) const ( diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index 0baaf43e8d8..3a44ce7243a 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -23,13 +23,13 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api/latest" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/flag" ) type ViewOptions struct { diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go index a8358902e3f..0e89d1f424c 100644 --- a/pkg/kubectl/cmd/util/factory_client_access.go +++ b/pkg/kubectl/cmd/util/factory_client_access.go @@ -35,6 +35,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilflag "k8s.io/apiserver/pkg/util/flag" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" @@ -49,7 +50,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" - utilflag "k8s.io/kubernetes/pkg/util/flag" ) type ring0Factory struct { diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index 7929e83a8ac..e7c6fd84ed7 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -37,6 +37,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/api" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" - "k8s.io/kubernetes/pkg/util/flag" ) func TestNewFactoryDefaultFlagBindings(t *testing.T) { diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 3c2ae2bae3f..c25e03986fe 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -42,6 +42,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" + utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/util/clock" "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/integer" @@ -92,7 +93,6 @@ import ( "k8s.io/kubernetes/pkg/util/bandwidth" utildbus "k8s.io/kubernetes/pkg/util/dbus" utilexec "k8s.io/kubernetes/pkg/util/exec" - utilflag "k8s.io/kubernetes/pkg/util/flag" kubeio "k8s.io/kubernetes/pkg/util/io" utilipt "k8s.io/kubernetes/pkg/util/iptables" "k8s.io/kubernetes/pkg/util/mount" diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/plugin/cmd/kube-scheduler/scheduler.go index bd3369f0463..42b3207d7b1 100644 --- a/plugin/cmd/kube-scheduler/scheduler.go +++ b/plugin/cmd/kube-scheduler/scheduler.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" diff --git a/pkg/util/flag/BUILD b/staging/src/k8s.io/apiserver/pkg/util/flag/BUILD similarity index 100% rename from pkg/util/flag/BUILD rename to staging/src/k8s.io/apiserver/pkg/util/flag/BUILD diff --git a/pkg/util/flag/configuration_map.go b/staging/src/k8s.io/apiserver/pkg/util/flag/configuration_map.go similarity index 100% rename from pkg/util/flag/configuration_map.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/configuration_map.go diff --git a/pkg/util/flag/flags.go b/staging/src/k8s.io/apiserver/pkg/util/flag/flags.go similarity index 100% rename from pkg/util/flag/flags.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/flags.go diff --git a/pkg/util/flag/namedcertkey_flag.go b/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag.go similarity index 100% rename from pkg/util/flag/namedcertkey_flag.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag.go diff --git a/pkg/util/flag/namedcertkey_flag_test.go b/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go similarity index 100% rename from pkg/util/flag/namedcertkey_flag_test.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go diff --git a/pkg/util/flag/string_flag.go b/staging/src/k8s.io/apiserver/pkg/util/flag/string_flag.go similarity index 100% rename from pkg/util/flag/string_flag.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/string_flag.go diff --git a/pkg/util/flag/tristate.go b/staging/src/k8s.io/apiserver/pkg/util/flag/tristate.go similarity index 100% rename from pkg/util/flag/tristate.go rename to staging/src/k8s.io/apiserver/pkg/util/flag/tristate.go