From 895ac2c1d46ecdd3fa8731421e3232259e3b42d9 Mon Sep 17 00:00:00 2001
From: Patrick Baxter <pb@coreos.com>
Date: Tue, 26 Jul 2016 02:33:26 +0000
Subject: [PATCH] cluster/images/hyperkube: re-add hyperkube busybox style
 symlinks

---
 cluster/images/hyperkube/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index 9f5d54c3fb2..0723f8e29bd 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -72,6 +72,14 @@ COPY cni /opt/cni
 COPY cni-conf /etc/cni/net.d
 
 # Create symlinks for each hyperkube server
-# TODO: this is unreliable for now (e.g. running "/kubelet" panics)
-# Also, it doesn't work for other architectures
+# TODO: replace manual symlink creation with --make-symlink command once
+# cross-building with qemu supports go binaries. See #28702
 # RUN /hyperkube --make-symlinks
+RUN ln -s /hyperkube /apiserver \
+ && ln -s /hyperkube /controller-manager \
+ && ln -s /hyperkube /federation-apiserver \
+ && ln -s /hyperkube /federation-controller-manager \
+ && ln -s /hyperkube /kubectl \
+ && ln -s /hyperkube /kubelet \
+ && ln -s /hyperkube /proxy \
+ && ln -s /hyperkube /scheduler