Merge pull request #29591 from pbx0/symlinks

Automatic merge from submit-queue cluster/images/hyperkube: re-add hyperkube busybox style symlinks Originally symlinks were added with a `--make-symlinks` command discussed in #24510 and implemented in #24511. It was backed out in #25693 because go binaries don't run in qemu and this breaks cross-building the Dockerfile for arm. In this case, due to running `hyperkube --make-symlinks`. Lets just add the symlinks manually until the upstream bug is fixed (qemu). fixes #28702 @mikedanese @thockin @yifan-gu @euank
kubernetes · Aug 2, 2016 · 1ec1051 · 1ec1051
2 parents d9ca9e8 + 895ac2c
commit 1ec1051
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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