diff --git a/.circleci/config.yml b/.circleci/config.yml index d9e44e5..5810e2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ env: &env environment: GRUNTWORK_INSTALLER_VERSION: v0.0.38 TERRATEST_LOG_PARSER_VERSION: v0.40.6 - MODULE_CI_VERSION: v0.56.0 + MODULE_CI_VERSION: v0.57.3 TERRAFORM_VERSION: 1.2.7 TERRAGRUNT_VERSION: NONE PACKER_VERSION: NONE diff --git a/eks/sync.go b/eks/sync.go index 968d7a4..5896762 100644 --- a/eks/sync.go +++ b/eks/sync.go @@ -39,10 +39,11 @@ const ( var ( // NOTE: Ensure that there is an entry for each supported version in the following tables. - supportedVersions = []string{"1.29", "1.28", "1.27", "1.26", "1.25"} + supportedVersions = []string{"1.30", "1.29", "1.28", "1.27", "1.26", "1.25"} // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-coredns.html coreDNSVersionLookupTable = map[string]string{ + "1.30": "1.11.1-eksbuild", "1.29": "1.11.1-eksbuild", "1.28": "1.10.1-eksbuild", "1.27": "1.10.1-eksbuild", @@ -52,20 +53,22 @@ var ( // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-kube-proxy.html#updating-kube-proxy-add-on kubeProxyVersionLookupTable = map[string]string{ - "1.29": "1.29.1-minimal-eksbuild", - "1.28": "1.28.6-minimal-eksbuild", - "1.27": "1.27.10-minimal-eksbuild", - "1.26": "1.26.13-minimal-eksbuild", + "1.30": "1.30.3-minimal-eksbuild", + "1.29": "1.29.7-minimal-eksbuild", + "1.28": "1.28.12-minimal-eksbuild", + "1.27": "1.27.16-minimal-eksbuild", + "1.26": "1.26.15-minimal-eksbuild", "1.25": "1.25.16-minimal-eksbuild", } // Reference: https://docs.aws.amazon.com/eks/latest/userguide/managing-vpc-cni.html amazonVPCCNIVersionLookupTable = map[string]string{ - "1.29": "1.16.2", - "1.28": "1.16.2", - "1.27": "1.16.2", - "1.26": "1.16.2", - "1.25": "1.16.2", + "1.30": "1.18.3", + "1.29": "1.18.3", + "1.28": "1.18.3", + "1.27": "1.18.3", + "1.26": "1.18.3", + "1.25": "1.18.3", } defaultContainerImageAccount = "602401143452" diff --git a/eks/sync_test.go b/eks/sync_test.go index dd86d91..8b9fab7 100644 --- a/eks/sync_test.go +++ b/eks/sync_test.go @@ -197,16 +197,18 @@ func TestFindLatestEKSBuilds(t *testing.T) { region string expectedVersion string }{ - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.29", "us-east-1", "1.11.1-eksbuild.8"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.28", "us-east-1", "1.10.1-eksbuild.10"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.27", "us-east-1", "1.10.1-eksbuild.10"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.26", "us-east-1", "1.9.3-eksbuild.14"}, - {coreDNSVersionLookupTable, coreDNSRepoPath, "1.25", "us-east-1", "1.9.3-eksbuild.14"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.29", "us-east-1", "1.29.1-minimal-eksbuild.3"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.28", "us-east-1", "1.28.6-minimal-eksbuild.3"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.27", "us-east-1", "1.27.10-minimal-eksbuild.3"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.26", "us-east-1", "1.26.13-minimal-eksbuild.3"}, - {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.25", "us-east-1", "1.25.16-minimal-eksbuild.6"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.30", "us-east-1", "1.11.1-eksbuild.12"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.29", "us-east-1", "1.11.1-eksbuild.12"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.28", "us-east-1", "1.10.1-eksbuild.14"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.27", "us-east-1", "1.10.1-eksbuild.14"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.26", "us-east-1", "1.9.3-eksbuild.18"}, + {coreDNSVersionLookupTable, coreDNSRepoPath, "1.25", "us-east-1", "1.9.3-eksbuild.18"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.30", "us-east-1", "1.30.3-minimal-eksbuild.6"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.29", "us-east-1", "1.29.7-minimal-eksbuild.6"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.28", "us-east-1", "1.28.12-minimal-eksbuild.6"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.27", "us-east-1", "1.27.16-minimal-eksbuild.6"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.26", "us-east-1", "1.26.15-minimal-eksbuild.11"}, + {kubeProxyVersionLookupTable, kubeProxyRepoPath, "1.25", "us-east-1", "1.25.16-minimal-eksbuild.14"}, } for _, tc := range testCase {