Update containers with new helm/kubectl versions (#621)

* Update helm, kubectl and container dependencies * Fix docker install
GoogleCloudPlatform · Dec 5, 2023 · 74ce2dd · 74ce2dd
1 parent ea1aecf
commit 74ce2dd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/marketplace/deployer_envsubst_base/Dockerfile b/marketplace/deployer_envsubst_base/Dockerfile
@@ -1,4 +1,4 @@
-FROM marketplace.gcr.io/google/ubuntu2004
+FROM marketplace.gcr.io/google/ubuntu2204
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     bash \
@@ -17,15 +17,15 @@ RUN pip3 install \
       pyyaml \
       six
 
-RUN for full_version in 1.26.5 1.26.5 1.27.2;  \
+RUN for full_version in 1.27.3 1.28.3;  \
      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.26 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.27 /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
@@ -1,4 +1,4 @@
-FROM marketplace.gcr.io/google/ubuntu2004
+FROM marketplace.gcr.io/google/ubuntu2204
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     bash \
@@ -14,22 +14,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip3 install \
       wheel \
       pyOpenSSL \
-      pyyaml \
-      six
+      pyyaml
 
-RUN for full_version in 1.26.5 1.26.5 1.27.2;  \
+RUN for full_version in 1.27.3 1.28.3;  \
      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.26 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.27 /opt/kubectl/default
 
 RUN mkdir -p /bin/helm-downloaded \
     && wget -q -O /bin/helm-downloaded/helm.tar.gz \
-        https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz \
+        https://get.helm.sh/helm-v3.13.2-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
@@ -1,4 +1,4 @@
-FROM marketplace.gcr.io/google/ubuntu2004
+FROM marketplace.gcr.io/google/ubuntu2204
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gnupg \
         python3 \
         python3-pip \
-        python-is-python3 \
      && rm -rf /var/lib/apt/lists/*
 
 RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
@@ -24,27 +23,25 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
 RUN pip3 install \
       wheel \
       pyOpenSSL \
-      pyyaml \
-      six
+      pyyaml
 
-RUN for full_version in 1.26.5 1.26.5 1.27.2;  \
+RUN for full_version in 1.27.3 1.28.3;  \
      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.26 /opt/kubectl/default
+RUN ln -s /opt/kubectl/1.27 /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 \
+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=5:19.03.13~3-0~ubuntu-focal
-
+     && 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.12.2-linux-amd64.tar.gz \
+        https://get.helm.sh/helm-v3.13.2-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/tests/py/Dockerfile b/tests/py/Dockerfile
@@ -1,7 +1,10 @@
-FROM gcr.io/google-appengine/python
+FROM gcr.io/cloud-marketplace/google/ubuntu2204
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      python3 \
+      python3-pip
 
 RUN pip3 install \
-      futures \
       google-cloud-storage \
       pyflakes \
       pyOpenSSL \