From fbbb863433fd2523711ed106a41bc46ad777fd21 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 15 Oct 2018 14:36:49 -0700 Subject: [PATCH] Create hyperkube symlinks in base image --- build/debian-hyperkube-base/Dockerfile | 16 ++++++++++++++++ build/debian-hyperkube-base/Makefile | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/build/debian-hyperkube-base/Dockerfile b/build/debian-hyperkube-base/Dockerfile index f4b5ecbec7..bdb982c3cf 100644 --- a/build/debian-hyperkube-base/Dockerfile +++ b/build/debian-hyperkube-base/Dockerfile @@ -14,6 +14,22 @@ FROM BASEIMAGE +# TODO(#69896): deprecate the shortened aliases in / +RUN ln -s /hyperkube /apiserver \ + && ln -s /hyperkube /cloud-controller-manager \ + && ln -s /hyperkube /controller-manager \ + && ln -s /hyperkube /kubectl \ + && ln -s /hyperkube /kubelet \ + && ln -s /hyperkube /proxy \ + && ln -s /hyperkube /scheduler \ + && ln -s /hyperkube /usr/local/bin/cloud-controller-manager \ + && ln -s /hyperkube /usr/local/bin/kube-apiserver \ + && ln -s /hyperkube /usr/local/bin/kube-controller-manager \ + && ln -s /hyperkube /usr/local/bin/kube-proxy \ + && ln -s /hyperkube /usr/local/bin/kube-scheduler \ + && ln -s /hyperkube /usr/local/bin/kubectl \ + && ln -s /hyperkube /usr/local/bin/kubelet + RUN echo CACHEBUST>/dev/null && clean-install \ bash diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 4a67da27a0..d9c0d87a00 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -19,7 +19,7 @@ REGISTRY?=staging-k8s.gcr.io IMAGE?=$(REGISTRY)/debian-hyperkube-base -TAG=0.10.2 +TAG=0.11.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x CACHEBUST?=1