From ca3ee9e5a19f346c7c1e29178d2ca117c93ce8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?=
 <lucas.kaldstrom@hotmail.co.uk>
Date: Wed, 22 Jun 2016 00:48:46 +0300
Subject: [PATCH] Revert kube-proxy as a DaemonSet in hyperkube for the v1.3
 release

---
 cluster/images/hyperkube/Dockerfile           |  6 +++++
 cluster/images/hyperkube/Makefile             |  4 ++-
 cluster/images/hyperkube/kube-proxy-ds.yaml   |  2 ++
 .../hyperkube/static-pods/addon-manager.json  |  2 +-
 .../hyperkube/static-pods/kube-proxy.json     | 27 +++++++++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 cluster/images/hyperkube/static-pods/kube-proxy.json

diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index 61d3a776ded..64e8d1ef73a 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -43,10 +43,16 @@ COPY static-pods/master.json /etc/kubernetes/manifests/
 COPY static-pods/etcd.json /etc/kubernetes/manifests/
 COPY static-pods/addon-manager.json /etc/kubernetes/manifests/
 
+# TODO: Move out kube-proxy to a DaemonSet again
+COPY static-pods/kube-proxy.json /etc/kubernetes/manifests/
+
 # Manifests for the docker-multinode guide
 COPY static-pods/master-multi.json /etc/kubernetes/manifests-multi/
 COPY static-pods/addon-manager.json /etc/kubernetes/manifests-multi/
 
+# TODO: Move out kube-proxy to a DaemonSet again
+COPY static-pods/kube-proxy.json /etc/kubernetes/manifests-multi/
+
 # Copy over all addons
 COPY addons /etc/kubernetes/addons
 
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 77febc779a9..94bee1addd7 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -61,7 +61,9 @@ endif
 	cp ../../saltbase/salt/kube-dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/skydns-svc.yaml
 	cp ../../addons/dashboard/dashboard-controller.yaml ${TEMP_DIR}/addons
 	cp ../../addons/dashboard/dashboard-service.yaml ${TEMP_DIR}/addons
-	cp kube-proxy-ds.yaml ${TEMP_DIR}/addons/kube-proxy.yaml
+	
+	# TODO: Move out kube-proxy to a DaemonSet again
+	#cp kube-proxy-ds.yaml ${TEMP_DIR}/addons/kube-proxy.yaml
 	cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR}
 
 	cd ${TEMP_DIR} && sed -i.back "s|VERSION|${VERSION}|g" addons/*.yaml static-pods/*.json
diff --git a/cluster/images/hyperkube/kube-proxy-ds.yaml b/cluster/images/hyperkube/kube-proxy-ds.yaml
index c043b4ce6ff..a81504c77e6 100644
--- a/cluster/images/hyperkube/kube-proxy-ds.yaml
+++ b/cluster/images/hyperkube/kube-proxy-ds.yaml
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# TODO: Move out kube-proxy to a DaemonSet again
+# This is disabled for the v1.3 release, due to bootstrapping complexities
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
diff --git a/cluster/images/hyperkube/static-pods/addon-manager.json b/cluster/images/hyperkube/static-pods/addon-manager.json
index eed276c21dc..4d0f0bd6876 100644
--- a/cluster/images/hyperkube/static-pods/addon-manager.json
+++ b/cluster/images/hyperkube/static-pods/addon-manager.json
@@ -11,7 +11,7 @@
     "containers": [
       {
         "name": "kube-addon-manager",
-        "image": "gcr.io/google-containers/kube-addon-manager-ARCH:v3",
+        "image": "gcr.io/google-containers/kube-addon-manager-ARCH:v4",
         "resources": {
           "requests": {
             "cpu": "5m",
diff --git a/cluster/images/hyperkube/static-pods/kube-proxy.json b/cluster/images/hyperkube/static-pods/kube-proxy.json
new file mode 100644
index 00000000000..b005433b86d
--- /dev/null
+++ b/cluster/images/hyperkube/static-pods/kube-proxy.json
@@ -0,0 +1,27 @@
+{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "k8s-proxy",
+    "namespace": "kube-system"
+  },
+  "spec": {
+    "hostNetwork": true,
+    "containers": [
+      {
+        "name": "kube-proxy",
+        "image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
+        "command": [
+                "/hyperkube",
+                "proxy",
+                "--master=http://127.0.0.1:8080",
+                "--v=2",
+                "--resource-container=\"\""
+        ],
+        "securityContext": {
+          "privileged": true
+        }
+      }
+    ]
+  }
+}