From fc4426f0403c72e1cbd6eaa28fc87ddeab9ccf4b Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Sat, 24 Feb 2018 13:35:45 -0500
Subject: [PATCH] Partial revert to fix local-up-cluster.sh

---
 cmd/kube-proxy/BUILD         |  1 +
 cmd/kube-proxy/app/server.go |  2 +-
 cmd/kube-proxy/proxy.go      | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD
index 87af1d60d35..e2527b436cf 100644
--- a/cmd/kube-proxy/BUILD
+++ b/cmd/kube-proxy/BUILD
@@ -22,6 +22,7 @@ go_library(
         "//cmd/kube-proxy/app:go_default_library",
         "//pkg/client/metrics/prometheus:go_default_library",
         "//pkg/version/prometheus: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/server.go b/cmd/kube-proxy/app/server.go
index 4e8755d6d6e..46d715ed498 100644
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -354,7 +354,7 @@ with the apiserver API to configure the proxy.`,
 		glog.Fatalf("unable to create flag defaults: %v", err)
 	}
 
-	opts.AddFlags(pflag.CommandLine)
+	opts.AddFlags(cmd.Flags())
 
 	cmd.MarkFlagFilename("config", "yaml", "yml", "json")
 
diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go
index be85880ff73..092491e3376 100644
--- a/cmd/kube-proxy/proxy.go
+++ b/cmd/kube-proxy/proxy.go
@@ -17,11 +17,14 @@ limitations under the License.
 package main
 
 import (
+	goflag "flag"
 	"fmt"
 	"math/rand"
 	"os"
 	"time"
 
+	"github.com/spf13/pflag"
+
 	utilflag "k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/kubernetes/cmd/kube-proxy/app"
@@ -34,7 +37,12 @@ func main() {
 
 	command := app.NewProxyCommand()
 
-	utilflag.InitFlags()
+	// TODO: once we switch everything over to Cobra commands, we can go back to calling
+	// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
+	// normalize func and add the go flag set by hand.
+	pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
+	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+	// utilflag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()