From 6f6ddc09c401d314b2455d24e6a9d0522ceb62f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Thu, 9 Feb 2017 21:46:00 +0200 Subject: [PATCH] Make symlinks to /usr/local/bin/ in the hyperkube image --- cluster/images/hyperkube/Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile index cc81f734820..d5abe8a4fb6 100644 --- a/cluster/images/hyperkube/Dockerfile +++ b/cluster/images/hyperkube/Dockerfile @@ -66,6 +66,8 @@ COPY cni-bin/bin /opt/cni/bin COPY cni-conf /etc/cni/net.d # Create symlinks for each hyperkube server +# Also create symlinks to /usr/local/bin/ where the server image binaries live, so the hyperkube image may be +# used instead of gcr.io/google_containers/kube-* without any modifications. # TODO: replace manual symlink creation with --make-symlink command once # cross-building with qemu supports go binaries. See #28702 # RUN /hyperkube --make-symlinks @@ -76,8 +78,15 @@ RUN ln -s /hyperkube /apiserver \ && ln -s /hyperkube /kubectl \ && ln -s /hyperkube /kubelet \ && ln -s /hyperkube /proxy \ - && ln -s /hyperkube /scheduler + && ln -s /hyperkube /scheduler \ + && ln -s /hyperkube /usr/local/bin/kube-apiserver \ + && ln -s /hyperkube /usr/local/bin/kube-controller-manager \ + && ln -s /hyperkube /usr/local/bin/federation-apiserver \ + && ln -s /hyperkube /usr/local/bin/federation-controller-manager \ + && ln -s /hyperkube /usr/local/bin/kubectl \ + && ln -s /hyperkube /usr/local/bin/kubelet \ + && ln -s /hyperkube /usr/local/bin/kube-proxy \ + && ln -s /hyperkube /usr/local/bin/kube-scheduler # Copy the hyperkube binary COPY hyperkube /hyperkube -