From eb81ef6023622b9bc868fb335eb8527b85a6b4e5 Mon Sep 17 00:00:00 2001 From: Harry Zhang Date: Tue, 11 Oct 2016 23:28:59 -0400 Subject: [PATCH] Merge string flag into util flag --- cmd/kubelet/app/options/options.go | 8 ++++---- pkg/kubectl/cmd/config/create_authinfo.go | 15 +++++++-------- pkg/kubectl/cmd/config/create_authinfo_test.go | 6 +++--- pkg/kubectl/cmd/config/create_cluster.go | 7 +++---- pkg/kubectl/cmd/config/create_context.go | 8 ++++---- pkg/util/{ => flag}/string_flag.go | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) rename pkg/util/{ => flag}/string_flag.go (99%) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index f8961e922a5..85ca9771ff9 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" - "k8s.io/kubernetes/pkg/util" utilconfig "k8s.io/kubernetes/pkg/util/config" + "k8s.io/kubernetes/pkg/util/flag" "github.com/spf13/pflag" ) @@ -41,12 +41,12 @@ const ( type KubeletServer struct { componentconfig.KubeletConfiguration - KubeConfig util.StringFlag + KubeConfig flag.StringFlag BootstrapKubeconfig string // If true, an invalid KubeConfig will result in the Kubelet exiting with an error. RequireKubeConfig bool - AuthPath util.StringFlag // Deprecated -- use KubeConfig instead + AuthPath flag.StringFlag // Deprecated -- use KubeConfig instead APIServerList []string // Deprecated -- use KubeConfig instead // Insert a probability of random errors during calls to the master. @@ -67,7 +67,7 @@ func NewKubeletServer() *KubeletServer { config := componentconfig.KubeletConfiguration{} api.Scheme.Convert(&v1alpha1.KubeletConfiguration{}, &config, nil) return &KubeletServer{ - KubeConfig: util.NewStringFlag("/var/lib/kubelet/kubeconfig"), + KubeConfig: flag.NewStringFlag("/var/lib/kubelet/kubeconfig"), RequireKubeConfig: false, // in 1.5, default to true KubeletConfiguration: config, } diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/pkg/kubectl/cmd/config/create_authinfo.go index 82a2947cfa9..d7ed513fe6d 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -30,21 +30,20 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" ) type createAuthInfoOptions struct { configAccess clientcmd.ConfigAccess name string - authPath util.StringFlag - clientCertificate util.StringFlag - clientKey util.StringFlag - token util.StringFlag - username util.StringFlag - password util.StringFlag + authPath flag.StringFlag + clientCertificate flag.StringFlag + clientKey flag.StringFlag + token flag.StringFlag + username flag.StringFlag + password flag.StringFlag embedCertData flag.Tristate - authProvider util.StringFlag + authProvider flag.StringFlag authProviderArgs map[string]string authProviderArgsToRemove []string diff --git a/pkg/kubectl/cmd/config/create_authinfo_test.go b/pkg/kubectl/cmd/config/create_authinfo_test.go index a973bdc510b..bb10be356c8 100644 --- a/pkg/kubectl/cmd/config/create_authinfo_test.go +++ b/pkg/kubectl/cmd/config/create_authinfo_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/flag" ) -func stringFlagFor(s string) util.StringFlag { - var f util.StringFlag +func stringFlagFor(s string) flag.StringFlag { + var f flag.StringFlag f.Set(s) return f } diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index fba8ac447b0..27c31c08de9 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -28,17 +28,16 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" ) type createClusterOptions struct { configAccess clientcmd.ConfigAccess name string - server util.StringFlag - apiVersion util.StringFlag + server flag.StringFlag + apiVersion flag.StringFlag insecureSkipTLSVerify flag.Tristate - certificateAuthority util.StringFlag + certificateAuthority flag.StringFlag embedCAData flag.Tristate } diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index 85d02026c3d..7555b7a4430 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -26,15 +26,15 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/flag" ) type createContextOptions struct { configAccess clientcmd.ConfigAccess name string - cluster util.StringFlag - authInfo util.StringFlag - namespace util.StringFlag + cluster flag.StringFlag + authInfo flag.StringFlag + namespace flag.StringFlag } var ( diff --git a/pkg/util/string_flag.go b/pkg/util/flag/string_flag.go similarity index 99% rename from pkg/util/string_flag.go rename to pkg/util/flag/string_flag.go index 9d6a00a1592..331bdb66e25 100644 --- a/pkg/util/string_flag.go +++ b/pkg/util/flag/string_flag.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package flag // StringFlag is a string flag compatible with flags and pflags that keeps track of whether it had a value supplied or not. type StringFlag struct {