Skip to content

Commit

Permalink
Update helm and kubectl to latest versions (#602)
Browse files Browse the repository at this point in the history
* Update helm and kubectl to latest versions
  • Loading branch information
stevecs-google authored Jan 4, 2023
1 parent 25d7768 commit 31312bf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions marketplace/deployer_envsubst_base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ RUN pip3 install \
pyyaml \
six

RUN for full_version in 1.22.12 1.24.3; \
RUN for full_version in 1.23.13 1.24.7 1.25.4; \
do \
version=${full_version%.*} \
&& mkdir -p /opt/kubectl/$version \
&& wget -q -O /opt/kubectl/$version/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
&& chmod 755 /opt/kubectl/$version/kubectl; \
done;
RUN ln -s /opt/kubectl/1.22 /opt/kubectl/default
RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default

COPY marketplace/deployer_envsubst_base/* /bin/
COPY marketplace/deployer_util/* /bin/
Expand Down
6 changes: 3 additions & 3 deletions marketplace/deployer_helm_base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ RUN pip3 install \
pyyaml \
six

RUN for full_version in 1.22.12 1.24.3; \
RUN for full_version in 1.23.13 1.24.7 1.25.4; \
do \
version=${full_version%.*} \
&& mkdir -p /opt/kubectl/$version \
&& wget -q -O /opt/kubectl/$version/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
&& chmod 755 /opt/kubectl/$version/kubectl; \
done;
RUN ln -s /opt/kubectl/1.22 /opt/kubectl/default
RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default

RUN mkdir -p /bin/helm-downloaded \
&& wget -q -O /bin/helm-downloaded/helm.tar.gz \
https://get.helm.sh/helm-v3.10.0-linux-amd64.tar.gz \
https://get.helm.sh/helm-v3.10.3-linux-amd64.tar.gz \
&& tar -zxvf /bin/helm-downloaded/helm.tar.gz -C /bin/helm-downloaded \
&& mv /bin/helm-downloaded/linux-amd64/helm /bin/ \
&& rm -rf /bin/helm-downloaded
Expand Down
6 changes: 3 additions & 3 deletions marketplace/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ RUN pip3 install \
pyyaml \
six

RUN for full_version in 1.22.12 1.24.3; \
RUN for full_version in 1.23.13 1.24.7 1.25.4; \
do \
version=${full_version%.*} \
&& mkdir -p /opt/kubectl/$version \
&& wget -q -O /opt/kubectl/$version/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
&& chmod 755 /opt/kubectl/$version/kubectl; \
done;
RUN ln -s /opt/kubectl/1.22 /opt/kubectl/default
RUN ln -s /opt/kubectl/1.24 /opt/kubectl/default

RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu focal edge" | tee /etc/apt/sources.list.d/docker.list \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key --keyring /usr/share/keyrings/docker.gpg add - \
Expand All @@ -44,7 +44,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker

RUN mkdir -p /bin/helm-downloaded \
&& wget -q -O /bin/helm-downloaded/helm.tar.gz \
https://get.helm.sh/helm-v3.10.0-linux-amd64.tar.gz \
https://get.helm.sh/helm-v3.10.3-linux-amd64.tar.gz \
&& tar -zxvf /bin/helm-downloaded/helm.tar.gz -C /bin/helm-downloaded \
&& mv /bin/helm-downloaded/linux-amd64/helm /bin/ \
&& rm -rf /bin/helm-downloaded
Expand Down

0 comments on commit 31312bf

Please sign in to comment.