Skip to content

Commit

Permalink
Add support for EKS 1.28 (#213)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
ryehowell authored Nov 4, 2023
1 parent 32b0d81 commit decec19
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
26 changes: 13 additions & 13 deletions eks/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 10 additions & 10 deletions eks/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit decec19

Please sign in to comment.