From c339fc0c4fad91cbc0a9ce97532a2c238b0ca7e1 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Mon, 26 Feb 2018 09:03:29 -0700
Subject: [PATCH 1/2] Use feature-gates command line for kube-proxy

Avoid throwing `featureGates:` into the kube-proxy yaml, since it's
not in the right format. It should be

```
    featureGates:
      AllAlpha: true
```

Since FEATURES_GATES is set to `AllAlpha=true`, we can't just throw that
into the yaml file. Just pass along FEATURES_GATES in the command line
instead just like we do for all other services
---
 hack/local-up-cluster.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index 9491ecb1f69..38a21b41dc3 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -817,13 +817,13 @@ kind: KubeProxyConfiguration
 clientConnection:
   kubeconfig: ${CERT_DIR}/kube-proxy.kubeconfig
 hostnameOverride: ${HOSTNAME_OVERRIDE}
-featureGates: ${FEATURE_GATES}
 mode: ${KUBE_PROXY_MODE}
 EOF
 
     sudo "${GO_OUT}/hyperkube" proxy \
       --config=/tmp/kube-proxy.yaml \
       --master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" \
+      --feature-gates="${FEATURE_GATES}" \
       --v=${LOG_LEVEL} 2>&1 &
     PROXY_PID=$!
 

From 42cc24e68de9f990b08f62b5ba4e6085c3411cef Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Mon, 26 Feb 2018 16:28:55 +0000
Subject: [PATCH 2/2] Better PROXY_LOG and verbosity in the command line

`>"${PROXY_LOG}"` was in the wrong spot
---
 hack/local-up-cluster.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index 38a21b41dc3..fc366d5b3f8 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -821,10 +821,10 @@ mode: ${KUBE_PROXY_MODE}
 EOF
 
     sudo "${GO_OUT}/hyperkube" proxy \
-      --config=/tmp/kube-proxy.yaml \
-      --master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" \
+      --v=${LOG_LEVEL} \
       --feature-gates="${FEATURE_GATES}" \
-      --v=${LOG_LEVEL} 2>&1 &
+      --config=/tmp/kube-proxy.yaml \
+      --master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" 2>&1 &
     PROXY_PID=$!
 
     SCHEDULER_LOG=${LOG_DIR}/kube-scheduler.log