github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29591 from pbx0/symlinks

Browse Source 
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 https://github.com/kubernetes/kubernetes/issues/24510 and implemented in https://github.com/kubernetes/kubernetes/pull/24511.

It was backed out in https://github.com/kubernetes/kubernetes/pull/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
This commit is contained in:
k8s-merge-robot 2016-08-01 21:46:16 -07:00 committed by GitHub
commit 1ec1051170
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/images/hyperkube/Dockerfile
View File

@ -72,6 +72,14 @@ COPY cni /opt/cni
COPY cni-conf /etc/cni/net.d COPY cni-conf /etc/cni/net.d
# Create symlinks for each hyperkube server # Create symlinks for each hyperkube server
# TODO: this is unreliable for now (e.g. running "/kubelet" panics) # TODO: replace manual symlink creation with --make-symlink command once
# Also, it doesn't work for other architectures # cross-building with qemu supports go binaries. See #28702
# RUN /hyperkube --make-symlinks # 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