Upgrade helm to 2.14.1， fix chart issue (#288)

* Upgrade helm to 2.14.1, fix #24395930 * Upgrade helm to 2.14.1, fix #24395930 * Upgrade helm to 2.14.1, fix #24395930
kubeflow · Jan 9, 2020 · b96e1ac · b96e1ac
1 parent 2ae9c35
commit b96e1ac
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -5,7 +5,7 @@
 
 ARG GOLANG_VERSION=1.10
 ARG KUBE_VERSION=v1.11.2
-ARG HELM_VERSION=v2.9.1
+ARG HELM_VERSION=v2.14.1
 ARG VERSION=v0.3.0-rc
 ARG OS_ARCH=linux-amd64
 ARG COMMIT=stable

diff --git a/Dockerfile.install b/Dockerfile.install
@@ -7,8 +7,8 @@ COPY . .
 
 RUN make
 
-RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz && \
-    tar -xvf helm-v2.9.1-linux-amd64.tar.gz && \
+RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz && \
+    tar -xvf helm-v2.14.1-linux-amd64.tar.gz && \
     mv linux-amd64/helm /usr/local/bin/helm && \
     chmod u+x /usr/local/bin/helm
 

diff --git a/Dockerfile.notebook.cpu b/Dockerfile.notebook.cpu
@@ -12,8 +12,8 @@ COPY . .
 
 RUN make
 
-RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz && \
-    tar -xvf helm-v2.9.1-linux-amd64.tar.gz && \
+RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz && \
+    tar -xvf helm-v2.14.1-linux-amd64.tar.gz && \
     mv linux-amd64/helm /usr/local/bin/helm && \
     chmod u+x /usr/local/bin/helm
 
@@ -24,7 +24,7 @@ FROM $BASE_IMAGE
 
 COPY --from=build /go/src/github.com/kubeflow/arena/bin/arena /usr/local/bin/arena
 
-COPY --from=build /usr/local/bin/helm /usr/local/bin/helm
+COPY --from=build /usr/local/bin/helm /usr/local/bin/arena-helm
 
 COPY --from=build /go/src/github.com/kubeflow/arena/charts /charts
 

diff --git a/Dockerfile.notebook.kubeflow b/Dockerfile.notebook.kubeflow
@@ -11,8 +11,8 @@ COPY . .
 
 RUN make
 
-RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz && \
-    tar -xvf helm-v2.9.1-linux-amd64.tar.gz && \
+RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz && \
+    tar -xvf helm-v2.14.1-linux-amd64.tar.gz && \
     mv linux-amd64/helm /usr/local/bin/helm && \
     chmod u+x /usr/local/bin/helm
 
@@ -23,7 +23,7 @@ FROM $BASE_IMAGE
 
 COPY --from=build /go/src/github.com/kubeflow/arena/bin/arena /usr/local/bin/arena
 
-COPY --from=build /usr/local/bin/helm /usr/local/bin/helm
+COPY --from=build /usr/local/bin/helm /usr/local/bin/arena-helm
 
 COPY --from=build /go/src/github.com/kubeflow/arena/charts /charts
 

diff --git a/Makefile b/Makefile
@@ -109,7 +109,7 @@ notebook-image:
 build-pkg:
 	docker rm -f arena-pkg || true
 	docker build --build-arg "KUBE_VERSION=v1.11.2" \
-				 --build-arg "HELM_VERSION=v2.9.1" \
+				 --build-arg "HELM_VERSION=v2.14.1" \
 				 --build-arg "COMMIT=${GIT_SHORT_COMMIT}" \
 				 --build-arg "VERSION=${VERSION}" \
 				 --build-arg "OS_ARCH=${OS_ARCH}" \