Merge pull request #60379 from dims/partial-revert-to-fix-hyperkube-and-local-up-cluster

Automatic merge from submit-queue (batch tested with PRs 59723, 60379, 60329). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Partial revert to fix local-up-cluster.sh **What this PR does / why we need it**: https://github.com/kubernetes/kubernetes/commit/25e110dffc41a5b535adc0426947fce231040f8e broke hyperkube and local-up-cluster.sh. We should revert just the changes in proxy.go to get back to a working hyperkube **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #60378 **Special notes for your reviewer**: /assign @thockin /assign @stewart-yu **Release note**: ```release-note NONE ```

Merge pull request #60379 from dims/partial-revert-to-fix-hyperkube-and-local-up-cluster
e7bca90e · Kubernetes Submit Queue · GitHub · 7499328f · fc4426f0 · e7bca90e
Unverified Commit e7bca90e authored Feb 25, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

BUILD cmd/kube-proxy/BUILD +1 -0

server.go cmd/kube-proxy/app/server.go +1 -1

proxy.go cmd/kube-proxy/proxy.go +9 -1

No files found.
--- 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",
    ],

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

--- 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()