Merge branch 'master' into ai-gsutil-migration-cff908f97d9e43ceb7ffe5d01973215d

Author: gurusai-voleti

marketplace/deployer_envsubst_base/Dockerfile

@@ -18,15 +18,15 @@ RUN pip3 install \
       six \
       cryptography>=44.0.1
 
-RUN for full_version in 1.30.4 1.31.0;  \
+RUN for full_version in 1.33.5 1.35.0;  \
      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.31 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
 
 COPY marketplace/deployer_envsubst_base/* /bin/
 COPY marketplace/deployer_util/* /bin/

marketplace/deployer_helm_base/Dockerfile

@@ -17,19 +17,19 @@ RUN pip3 install \
       pyyaml \
       cryptography>=44.0.1
 
-RUN for full_version in 1.30.4 1.31.0;  \
+RUN for full_version in 1.33.5 1.35.0;  \
      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.31 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
 
 RUN mkdir -p /bin/helm-downloaded \
     && wget -q -O /bin/helm-downloaded/helm.tar.gz \
-        https://get.helm.sh/helm-v3.19.0-linux-amd64.tar.gz \
+        https://get.helm.sh/helm-v4.0.4-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

marketplace/dev/Dockerfile

@@ -26,23 +26,23 @@ RUN pip3 install \
       pyyaml \
       cryptography>=44.0.1
 
-RUN for full_version in 1.30.4 1.31.0;  \
+RUN for full_version in 1.33.5 1.35.0;  \
      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.31 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
 
 RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" | 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 - \
      && apt-get -y update \
      && apt-get -y install docker-ce
 RUN mkdir -p /bin/helm-downloaded \
      && wget -q -O /bin/helm-downloaded/helm.tar.gz \
-        https://get.helm.sh/helm-v3.19.0-linux-amd64.tar.gz \
+        https://get.helm.sh/helm-v4.0.4-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