From 1d8193dc0bbf203a200368814d9c4b9e4040a587 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 1 Aug 2018 07:49:35 -0700 Subject: [PATCH] revert back to /tiller when running `helm init --upgrade`, the entrypoint since v2.9.1 changed which caused tiller to never start. Kubernetes may be holding onto the same entrypoint during upgrades. (cherry picked from commit cfbc1744c71ab926e179da595a3e35647c15e4d2) --- rootfs/Dockerfile | 6 +++--- rootfs/Dockerfile.experimental | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index bfc071350..82dfa0d4c 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -18,10 +18,10 @@ RUN apk update && apk add ca-certificates socat && rm -rf /var/cache/apk/* ENV HOME /tmp -COPY helm /bin/helm -COPY tiller /bin/tiller +COPY helm /helm +COPY tiller /tiller EXPOSE 44134 USER nobody -ENTRYPOINT ["/bin/tiller"] +ENTRYPOINT ["/tiller"] diff --git a/rootfs/Dockerfile.experimental b/rootfs/Dockerfile.experimental index 329a31086..ca0c87f30 100644 --- a/rootfs/Dockerfile.experimental +++ b/rootfs/Dockerfile.experimental @@ -18,9 +18,9 @@ RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/* ENV HOME /tmp -COPY tiller /bin/tiller +COPY tiller /tiller EXPOSE 44134 USER nobody -ENTRYPOINT ["/bin/tiller", "--experimental-release"] +ENTRYPOINT ["/tiller", "--experimental-release"]