From f51c2c445c5513b284762e207b4e5ff51f36510a Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Fri, 19 May 2017 14:30:32 -0400 Subject: [PATCH] Restore kube-proxy --version --- cmd/kube-proxy/BUILD | 1 - cmd/kube-proxy/app/BUILD | 1 + cmd/kube-proxy/app/server.go | 2 ++ cmd/kube-proxy/proxy.go | 3 --- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index 4cfdfcf6f8a..d88ed1114bf 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -29,7 +29,6 @@ go_library( "//cmd/kube-proxy/app:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library", - "//pkg/version/verflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library", diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index 1c274c83e94..745d22f0fb6 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -40,6 +40,7 @@ go_library( "//pkg/util/oom:go_default_library", "//pkg/util/resourcecontainer:go_default_library", "//pkg/util/sysctl:go_default_library", + "//pkg/version/verflag:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 059debb8f92..993e6967f76 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -68,6 +68,7 @@ import ( "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/resourcecontainer" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" @@ -333,6 +334,7 @@ environment variables specifying ports opened by the service proxy. There is an addon that provides cluster DNS for these cluster IPs. The user must create a service with the apiserver API to configure the proxy.`, Run: func(cmd *cobra.Command, args []string) { + verflag.PrintAndExitIfRequested() cmdutil.CheckErr(opts.Complete()) cmdutil.CheckErr(opts.Validate(args)) cmdutil.CheckErr(opts.Run()) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 5d6ba8a8cb0..9ec68a51fed 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/cmd/kube-proxy/app" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration - "k8s.io/kubernetes/pkg/version/verflag" ) func main() { @@ -42,8 +41,6 @@ func main() { logs.InitLogs() defer logs.FlushLogs() - verflag.PrintAndExitIfRequested() - if err := command.Execute(); err != nil { os.Exit(1) }