Update base image in tag file(s) (#2288)

* [PR BOT] Update base image in tag file(s) * allow for kind image change by locking containerd/runc * kind checksums --------- Co-authored-by: Jackson West <jgw@amazon.com>
aws · Aug 12, 2023 · 585ce6f · 585ce6f
1 parent e78fd14
commit 585ce6f
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 10 deletions.
diff --git a/EKS_DISTRO_BASE_TAG_FILE b/EKS_DISTRO_BASE_TAG_FILE
@@ -1 +1 @@
-2023-06-27-1687892493.2
+2023-08-08-1691521261.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_GIT_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_GIT_TAG_FILE
@@ -1 +1 @@
-2023-06-27-1687892493.2
+2023-08-08-1691521261.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_IPTABLES_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_IPTABLES_TAG_FILE
@@ -1 +1 @@
-2023-06-22-1687460500.2
+2023-07-26-1690398104.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_KIND_AL2023_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_KIND_AL2023_TAG_FILE
@@ -1 +1 @@
-2023-06-13-1686682900.2023
+2023-08-10-1691694107.2023
diff --git a/EKS_DISTRO_MINIMAL_BASE_NGINX_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_NGINX_TAG_FILE
@@ -1 +1 @@
-2023-06-27-1687892493.2
+2023-07-20-1689879648.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE
@@ -1 +1 @@
-3.9-2023-06-27-1687892492.2023
+3.9-2023-08-10-1691694107.2023
diff --git a/projects/kubernetes-sigs/kind/CHECKSUMS b/projects/kubernetes-sigs/kind/CHECKSUMS
@@ -1,4 +1,4 @@
-5c192440c2870a7ff1810237503f3950853dbdf07a6057bb8d57e3040289ef7c  _output/bin/kind/linux-amd64/kind
-62344b893805da524e129c820b982574a04f84e35aaf98a5f4718c9f8a6edc65  _output/bin/kind/linux-amd64/kindnetd
-1061c140a1c85e3adba725bfb570366fb21a1642ba066ed8772a8abd5c29aba9  _output/bin/kind/linux-arm64/kind
-54a7a42aca5dc73a7909292e82ca801baa7d4715d14af6fdeefb4c18d4c334e1  _output/bin/kind/linux-arm64/kindnetd
+057fc05e48a0566cc13bab1568acd6d66c068521ab38d8d3316b3b412923bd1f  _output/bin/kind/linux-amd64/kind
+b39cbfb49a362a4f0e927b541025cea89fc7c6ca1792b2e28965713e9493090d  _output/bin/kind/linux-amd64/kindnetd
+fe588e4d6e367eba755530577f107986e13b77c770faaba55770dc667e8ef5fe  _output/bin/kind/linux-arm64/kind
+caabe7940bf5713902ca848904b878d50eaa1d93f091cefbf3a15efb110b566f  _output/bin/kind/linux-arm64/kindnetd
diff --git a/projects/kubernetes-sigs/kind/patches/0004-TEMP-lock-containerd-and-runc-version.patch b/projects/kubernetes-sigs/kind/patches/0004-TEMP-lock-containerd-and-runc-version.patch
@@ -0,0 +1,26 @@
+From 04ce891cae930cc9c1b08ff68aeeb727166d6376 Mon Sep 17 00:00:00 2001
+From: Prow Bot <prow@amazonaws.com>
+Date: Sat, 12 Aug 2023 12:08:58 -0500
+Subject: [PATCH] TEMP: lock containerd and runc version
+
+---
+ images/base/Dockerfile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/images/base/Dockerfile b/images/base/Dockerfile
+index e4c13a47..f38be515 100644
+--- a/images/base/Dockerfile
++++ b/images/base/Dockerfile
+@@ -103,6 +103,9 @@ RUN echo "Installing Packages ..." \
+ RUN echo "Enabling kubelet ... " \
+     && systemctl enable kubelet.service
+
++RUN echo "force runc and containerd version ... " \
++    && DEBIAN_FRONTEND=noninteractive clean-install containerd-1.6.19-1.amzn2023.0.1 runc-1.1.5-1.amzn2023.0.1
++
+ RUN echo "Enabling containerd ..." \
+     && ctr oci spec \
+         | jq '.hooks.createContainer[.hooks.createContainer| length] |= . + {"path": "/usr/local/bin/mount-product-files"}' \
+-- 
+2.40.1
+