From 6d9bf6f667f383ef366d6bdda8d1dcbb0872abd5 Mon Sep 17 00:00:00 2001 From: Sajia Zafreen Date: Fri, 15 Sep 2023 12:53:33 -0700 Subject: [PATCH] resolve merge conflict --- EKS_DISTRO_TAG_FILE.yaml | 70 ++++------------------------------------ 1 file changed, 6 insertions(+), 64 deletions(-) diff --git a/EKS_DISTRO_TAG_FILE.yaml b/EKS_DISTRO_TAG_FILE.yaml index 404703296..2e2d0b250 100644 --- a/EKS_DISTRO_TAG_FILE.yaml +++ b/EKS_DISTRO_TAG_FILE.yaml @@ -1,46 +1,4 @@ al2: -<<<<<<< HEAD - eks-distro-base: 2023-08-08-1691521261.2 - eks-distro-minimal-base: 2023-06-06-1686078098.2 - eks-distro-minimal-base-nonroot: 2023-06-06-1686078098.2 - eks-distro-minimal-base-glibc: 2023-06-08-1686250870.2 - eks-distro-minimal-base-iptables: 2023-07-26-1690398104.2 - eks-distro-minimal-base-docker-client: 2023-06-08-1686250870.2 - eks-distro-minimal-base-csi: 2023-08-08-1691521261.2 - eks-distro-minimal-base-csi-ebs: 2023-08-08-1691521261.2 - eks-distro-minimal-base-haproxy: 2023-06-08-1686250870.2 - eks-distro-minimal-base-kind: 2023-08-22-1692730868.2 - eks-distro-minimal-base-nginx: 2023-07-20-1689879648.2 - eks-distro-minimal-base-git: 2023-08-08-1691521261.2 - eks-distro-minimal-base-nsenter: 2023-07-20-1689879648.2 - eks-distro-minimal-base-python-3.7: 3.7-2023-06-27-1687892493.2 - eks-distro-minimal-base-python-3.9: 3.9-2023-06-27-1687892493.2 - eks-distro-minimal-base-nodejs-16: 16-2023-06-08-1686250870.2 - eks-distro-minimal-base-compiler-base: 2023-08-08-1691521261.2 - eks-distro-minimal-base-compiler-yum: yum-2023-08-08-1691521261.2 - eks-distro-minimal-base-compiler-gcc: gcc-2023-08-22-1692730868.2 - eks-distro-minimal-base-golang-compiler-1.18-base: null - eks-distro-minimal-base-golang-compiler-1.18-yum: null - eks-distro-minimal-base-golang-compiler-1.18-gcc: null - 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 - eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-08-08-1691521261.2 - eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-08-08-1691521261.2 - eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-08-22-1692730868.2 - eks-distro-minimal-base-python-compiler-3.7-base: 3.7-2023-08-08-1691521261.2 - eks-distro-minimal-base-python-compiler-3.7-yum: 3.7-yum-2023-08-08-1691521261.2 - eks-distro-minimal-base-python-compiler-3.7-gcc: 3.7-gcc-2023-08-22-1692730868.2 - eks-distro-minimal-base-python-compiler-3.9-base: 3.9-2023-08-08-1691521261.2 - eks-distro-minimal-base-python-compiler-3.9-yum: 3.9-yum-2023-08-08-1691521261.2 - eks-distro-minimal-base-python-compiler-3.9-gcc: 3.9-gcc-2023-08-22-1692730868.2 -======= eks-distro-base: 2023-09-13-1694631680.2 eks-distro-minimal-base: 2023-09-06-1694026927.2 eks-distro-minimal-base-nonroot: 2023-09-06-1694026927.2 @@ -69,6 +27,9 @@ al2: eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-09-13-1694631680.2 eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-09-13-1694631680.2 eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-09-13-1694631680.2 + 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 eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-09-13-1694631680.2 eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-09-13-1694631680.2 eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-09-13-1694631680.2 @@ -81,7 +42,6 @@ al2: eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2023-09-13-1694631680.2 eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2023-09-13-1694631680.2 eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2023-09-13-1694631680.2 ->>>>>>> main al2023: eks-distro-base: 2023-09-08-1694199666.2023 eks-distro-minimal-base: 2023-08-24-1692903666.2023 @@ -99,26 +59,6 @@ al2023: eks-distro-minimal-base-python-3.7: null eks-distro-minimal-base-python-3.9: 3.9-2023-09-08-1694199666.2023 eks-distro-minimal-base-nodejs-16: 16-2023-08-24-1692903666.2023 -<<<<<<< HEAD - eks-distro-minimal-base-compiler-base: 2023-08-24-1692903666.2023 - eks-distro-minimal-base-compiler-yum: yum-2023-08-24-1692903666.2023 - eks-distro-minimal-base-compiler-gcc: gcc-2023-08-24-1692903666.2023 - eks-distro-minimal-base-golang-compiler-1.18-base: null - eks-distro-minimal-base-golang-compiler-1.18-yum: null - eks-distro-minimal-base-golang-compiler-1.18-gcc: null - 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 - eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-08-24-1692903666.2023 - eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-08-24-1692903666.2023 - eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-08-24-1692903666.2023 -======= eks-distro-minimal-base-compiler-base: 2023-09-08-1694199666.2023 eks-distro-minimal-base-compiler-yum: yum-2023-09-08-1694199666.2023 eks-distro-minimal-base-compiler-gcc: gcc-2023-09-08-1694199666.2023 @@ -131,10 +71,12 @@ al2023: eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-09-08-1694199666.2023 eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-09-08-1694199666.2023 eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-09-08-1694199666.2023 + 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 eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-09-08-1694199666.2023 eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-09-08-1694199666.2023 eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-09-08-1694199666.2023 ->>>>>>> main eks-distro-minimal-base-python-compiler-3.7-base: null eks-distro-minimal-base-python-compiler-3.7-yum: null eks-distro-minimal-base-python-compiler-3.7-gcc: null