Trigger Builder Base update for 1.19, 1.20, 1.21

aws · Oct 12, 2023 · 7cb74ce · 7cb74ce
1 parent 7df06a9
commit 7cb74ce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/EKS_DISTRO_TAG_FILE.yaml b/EKS_DISTRO_TAG_FILE.yaml
@@ -21,12 +21,12 @@ al2:
   eks-distro-minimal-base-golang-compiler-1.18-base: 1.18-2023-10-11-1697050862.2
   eks-distro-minimal-base-golang-compiler-1.18-yum: 1.18-yum-2023-10-11-1697050862.2
   eks-distro-minimal-base-golang-compiler-1.18-gcc: 1.18-gcc-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.19-base: 1.19-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.19-yum: 1.19-yum-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.19-gcc: 1.19-gcc-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-10-11-1697050862.2
+  eks-distro-minimal-base-golang-compiler-1.19-base: null
+  eks-distro-minimal-base-golang-compiler-1.19-yum: null
+  eks-distro-minimal-base-golang-compiler-1.19-gcc: null
+  eks-distro-minimal-base-golang-compiler-1.20-base: null
+  eks-distro-minimal-base-golang-compiler-1.20-yum: null
+  eks-distro-minimal-base-golang-compiler-1.20-gcc: null
   eks-distro-minimal-base-golang-compiler-1.21-base: null
   eks-distro-minimal-base-golang-compiler-1.21-yum: null
   eks-distro-minimal-base-golang-compiler-1.21-gcc: null
@@ -39,9 +39,6 @@ al2:
   eks-distro-minimal-base-python-compiler-3.9-base: 3.9-2023-10-11-1697050862.2
   eks-distro-minimal-base-python-compiler-3.9-yum: 3.9-yum-2023-10-11-1697050862.2
   eks-distro-minimal-base-python-compiler-3.9-gcc: 3.9-gcc-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2023-10-11-1697050862.2
-  eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2023-10-11-1697050862.2
 al2023:
   eks-distro-base: 2023-10-11-1697050861.2023
   eks-distro-minimal-base: 2023-08-24-1692903666.2023
@@ -65,12 +62,12 @@ al2023:
   eks-distro-minimal-base-golang-compiler-1.18-base: 1.18-2023-10-11-1697050861.2023
   eks-distro-minimal-base-golang-compiler-1.18-yum: 1.18-yum-2023-10-11-1697050861.2023
   eks-distro-minimal-base-golang-compiler-1.18-gcc: 1.18-gcc-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.19-base: 1.19-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.19-yum: 1.19-yum-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.19-gcc: 1.19-gcc-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-10-11-1697050861.2023
+  eks-distro-minimal-base-golang-compiler-1.19-base: null
+  eks-distro-minimal-base-golang-compiler-1.19-yum: null
+  eks-distro-minimal-base-golang-compiler-1.19-gcc: null
+  eks-distro-minimal-base-golang-compiler-1.20-base: null
+  eks-distro-minimal-base-golang-compiler-1.20-yum: null
+  eks-distro-minimal-base-golang-compiler-1.20-gcc: null
   eks-distro-minimal-base-golang-compiler-1.21-base: null
   eks-distro-minimal-base-golang-compiler-1.21-yum: null
   eks-distro-minimal-base-golang-compiler-1.21-gcc: null
@@ -83,9 +80,6 @@ al2023:
   eks-distro-minimal-base-python-compiler-3.9-base: 3.9-2023-10-11-1697050861.2023
   eks-distro-minimal-base-python-compiler-3.9-yum: 3.9-yum-2023-10-11-1697050861.2023
   eks-distro-minimal-base-python-compiler-3.9-gcc: 3.9-gcc-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2023-10-11-1697050861.2023
-  eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2023-10-11-1697050861.2023
 windows:
   eks-distro-windows-base-1809: 1809-2023-10-10-1696964471.2
   eks-distro-windows-base-20H2: 20H2-2022-12-19-1671485888.2

diff --git a/builder-base/versions.yaml b/builder-base/versions.yaml
@@ -6,9 +6,9 @@ GITHUB_CLI_VERSION: 2.21.1
 GOLANG_VERSION_116: 1.16.15-7
 GOLANG_VERSION_117: 1.17.13-6
 GOLANG_VERSION_118: 1.18.10-8
-GOLANG_VERSION_119: 1.19.12-10
-GOLANG_VERSION_120: 1.20.8-9
-GOLANG_VERSION_121: 1.21.1-2
+GOLANG_VERSION_119: 1.19.12-12
+GOLANG_VERSION_120: 1.20.10-11
+GOLANG_VERSION_121: 1.21.3-4
 GO_LICENSES_VERSION: v1.6.0
 GOVC_VERSION: 0.25.0
 GOSS_VERSION: 3.1.4

diff --git a/eks-distro-base/Makefile b/eks-distro-base/Makefile
@@ -203,9 +203,9 @@ GOLANG_VARIANT_NAME=eks-distro-minimal-base-golang-compiler
 BASE_GOLANG_VARIANT_VERSIONS=1.18 1.19 1.20 1.21
 
 GOLANG_1.18_FULL_VERSION=1.18.10-8
-GOLANG_1.19_FULL_VERSION=1.19.12-10
-GOLANG_1.20_FULL_VERSION=1.20.8-9
-GOLANG_1.21_FULL_VERSION=1.21.0-0
+GOLANG_1.19_FULL_VERSION=1.19.12-12
+GOLANG_1.20_FULL_VERSION=1.20.10-11
+GOLANG_1.21_FULL_VERSION=1.21.3-4
 
 BASE_GOLANG_COMPILER_VARIANT_VERSIONS=$(foreach ver,$(BASE_GOLANG_VARIANT_VERSIONS),$(addprefix $(ver)-,$(BASE_COMPILER_VARIANT_VERSIONS)))
 # ************************************************************