From 31312bff3ac5a6aa5d64513dc9fa00d5331940bb Mon Sep 17 00:00:00 2001
From: Steve Smith <110853459+stevecs-google@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:58:47 -0800
Subject: [PATCH] Update helm and kubectl to latest versions (#602)

* Update helm and kubectl to latest versions
---
 marketplace/deployer_envsubst_base/Dockerfile | 4 ++--
 marketplace/deployer_helm_base/Dockerfile     | 6 +++---
 marketplace/dev/Dockerfile                    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/marketplace/deployer_envsubst_base/Dockerfile b/marketplace/deployer_envsubst_base/Dockerfile
index 9ab119e0..4064c026 100644
--- a/marketplace/deployer_envsubst_base/Dockerfile
+++ b/marketplace/deployer_envsubst_base/Dockerfile
@@ -17,7 +17,7 @@ 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 \
@@ -25,7 +25,7 @@ RUN for full_version in 1.22.12 1.24.3;  \
             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/
diff --git a/marketplace/deployer_helm_base/Dockerfile b/marketplace/deployer_helm_base/Dockerfile
index 564c7217..15c73da7 100644
--- a/marketplace/deployer_helm_base/Dockerfile
+++ b/marketplace/deployer_helm_base/Dockerfile
@@ -17,7 +17,7 @@ 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 \
@@ -25,11 +25,11 @@ RUN for full_version in 1.22.12 1.24.3;  \
             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
diff --git a/marketplace/dev/Dockerfile b/marketplace/dev/Dockerfile
index ddaa4006..97011d6c 100644
--- a/marketplace/dev/Dockerfile
+++ b/marketplace/dev/Dockerfile
@@ -27,7 +27,7 @@ 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 \
@@ -35,7 +35,7 @@ RUN for full_version in 1.22.12 1.24.3;  \
             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 - \
@@ -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