From decec194670364de349de1b8b0054e91f2baa370 Mon Sep 17 00:00:00 2001 From: Ryan Howell <86266251+ryehowell@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:27:11 -0400 Subject: [PATCH] Add support for EKS 1.28 (#213) * add support for eks 1.28 and drop support for eks 1.23 * update test table with latest versions as reported by api * update version mapping for kube-proxy latest version --- eks/sync.go | 26 +++++++++++++------------- eks/sync_test.go | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eks/sync.go b/eks/sync.go index 61d3128..87a864b 100644 --- a/eks/sync.go +++ b/eks/sync.go @@ -39,33 +39,33 @@ const ( var ( // NOTE: Ensure that there is an entry for each supported version in the following tables. - supportedVersions = []string{"1.27", "1.26", "1.25", "1.24", "1.23"} + supportedVersions = []string{"1.28", "1.27", "1.26", "1.25", "1.24"} // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html coreDNSVersionLookupTable = map[string]string{ + "1.28": "1.10.1-eksbuild", "1.27": "1.10.1-eksbuild", "1.26": "1.9.3-eksbuild", "1.25": "1.9.3-eksbuild", - "1.24": "1.8.7-eksbuild", - "1.23": "1.8.7-eksbuild", + "1.24": "1.9.3-eksbuild", } // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html#updating-kube-proxy-add-on kubeProxyVersionLookupTable = map[string]string{ - "1.27": "1.27.1-minimal-eksbuild", - "1.26": "1.26.2-minimal-eksbuild", - "1.25": "1.25.6-minimal-eksbuild", - "1.24": "1.24.7-minimal-eksbuild", - "1.23": "1.23.8-minimal-eksbuild", + "1.28": "1.28.2-minimal-eksbuild", + "1.27": "1.27.6-minimal-eksbuild", + "1.26": "1.26.9-minimal-eksbuild", + "1.25": "1.25.14-minimal-eksbuild", + "1.24": "1.24.17-minimal-eksbuild", } // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-vpc-cni.html amazonVPCCNIVersionLookupTable = map[string]string{ - "1.27": "1.13.2", - "1.26": "1.12.6", - "1.25": "1.12.2", - "1.24": "1.11.4", - "1.23": "1.11.4", + "1.28": "1.15.1", + "1.27": "1.15.1", + "1.26": "1.15.1", + "1.25": "1.15.1", + "1.24": "1.15.1", } defaultContainerImageAccount = "602401143452" diff --git a/eks/sync_test.go b/eks/sync_test.go index 4abff5f..02f6c2e 100644 --- a/eks/sync_test.go +++ b/eks/sync_test.go @@ -197,16 +197,16 @@ func TestFindLatestEKSBuilds(t *testing.T) { region string expectedVersion string }{ - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.27", "us-east-1", "1.10.1-eksbuild.2"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.26", "us-east-1", "1.9.3-eksbuild.5"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.25", "us-east-1", "1.9.3-eksbuild.5"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.24", "us-east-1", "1.8.7-eksbuild.7"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.23", "us-east-1", "1.8.7-eksbuild.7"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.27", "us-east-1", "1.27.1-minimal-eksbuild.1"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.26", "us-east-1", "1.26.2-minimal-eksbuild.1"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.25", "us-east-1", "1.25.6-minimal-eksbuild.2"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.24", "us-east-1", "1.24.7-minimal-eksbuild.2"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.23", "us-east-1", "1.23.8-minimal-eksbuild.2"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.28", "us-east-1", "1.10.1-eksbuild.5"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.27", "us-east-1", "1.10.1-eksbuild.5"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.26", "us-east-1", "1.9.3-eksbuild.9"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.25", "us-east-1", "1.9.3-eksbuild.9"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.24", "us-east-1", "1.9.3-eksbuild.9"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.28", "us-east-1", "1.28.2-minimal-eksbuild.2"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.27", "us-east-1", "1.27.6-minimal-eksbuild.2"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.26", "us-east-1", "1.26.9-minimal-eksbuild.2"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.25", "us-east-1", "1.25.14-minimal-eksbuild.2"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.24", "us-east-1", "1.24.17-minimal-eksbuild.3"}, } for _, tc := range testCase {