From e446b111dd4177d3ffcbbe69802f9237849bb81d Mon Sep 17 00:00:00 2001 From: eksctl-bot <53547694+eksctl-bot@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:21:35 +0000 Subject: [PATCH 1/2] Update coredns --- pkg/addons/default/assets/coredns-1.23.json | 2 +- pkg/addons/default/assets/coredns-1.24.json | 2 +- pkg/addons/default/assets/coredns-1.25.json | 2 +- pkg/addons/default/assets/coredns-1.26.json | 2 +- pkg/addons/default/assets/coredns-1.27.json | 2 +- pkg/addons/default/assets/coredns-1.28.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/addons/default/assets/coredns-1.23.json b/pkg/addons/default/assets/coredns-1.23.json index 8f75415009..3dd45f4b4c 100644 --- a/pkg/addons/default/assets/coredns-1.23.json +++ b/pkg/addons/default/assets/coredns-1.23.json @@ -169,7 +169,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.24.json b/pkg/addons/default/assets/coredns-1.24.json index 6c57a00b65..59c4ee0623 100644 --- a/pkg/addons/default/assets/coredns-1.24.json +++ b/pkg/addons/default/assets/coredns-1.24.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.3", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.25.json b/pkg/addons/default/assets/coredns-1.25.json index 275418780b..243f65b3f4 100644 --- a/pkg/addons/default/assets/coredns-1.25.json +++ b/pkg/addons/default/assets/coredns-1.25.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.26.json b/pkg/addons/default/assets/coredns-1.26.json index 27c4259d9b..1eb6e77d40 100644 --- a/pkg/addons/default/assets/coredns-1.26.json +++ b/pkg/addons/default/assets/coredns-1.26.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.27.json b/pkg/addons/default/assets/coredns-1.27.json index 3ad8d820d7..4cf4a2b158 100644 --- a/pkg/addons/default/assets/coredns-1.27.json +++ b/pkg/addons/default/assets/coredns-1.27.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.1", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.4", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.28.json b/pkg/addons/default/assets/coredns-1.28.json index db55fca636..95ceca2326 100644 --- a/pkg/addons/default/assets/coredns-1.28.json +++ b/pkg/addons/default/assets/coredns-1.28.json @@ -172,7 +172,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.3", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.4", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, From 5517b83dda82505d9515fa09ae14faf7feab24ca Mon Sep 17 00:00:00 2001 From: Tibi <110664232+TiberiuGC@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:25:51 +0300 Subject: [PATCH 2/2] fix unit test --- pkg/addons/default/coredns_test.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkg/addons/default/coredns_test.go b/pkg/addons/default/coredns_test.go index d88dfc8e5f..419ced39b1 100644 --- a/pkg/addons/default/coredns_test.go +++ b/pkg/addons/default/coredns_test.go @@ -2,13 +2,16 @@ package defaultaddons_test import ( "context" + "fmt" + "os" + "path/filepath" + "regexp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" da "github.com/weaveworks/eksctl/pkg/addons/default" - "github.com/weaveworks/eksctl/pkg/testutils" ) @@ -25,12 +28,12 @@ var _ = Describe("default addons - coredns", func() { rawClient = testutils.NewFakeRawClient() rawClient.UseUnionTracker = true region = "eu-west-2" - controlPlaneVersion = "1.24.x" - kubernetesVersion = "1.23" + kubernetesVersion = "1.25" + controlPlaneVersion = "1.26" input = da.AddonInput{ RawClient: rawClient, - ControlPlaneVersion: controlPlaneVersion, + ControlPlaneVersion: controlPlaneVersion + ".x", Region: region, } }) @@ -42,7 +45,12 @@ var _ = Describe("default addons - coredns", func() { BeforeEach(func() { createCoreDNSFromTestSample(rawClient, kubernetesVersion) - expectedImageTag = "v1.8.7-eksbuild.3" + + coreFile, err := os.ReadFile(filepath.Join("assets", fmt.Sprintf("coredns-%s.json", controlPlaneVersion))) + Expect(err).NotTo(HaveOccurred()) + + expectedImageTag = regexp.MustCompile(`v\d+\.\d+\.\d+-eksbuild\.\d+`).FindString(string(coreFile)) + Expect(expectedImageTag).NotTo(BeEmpty()) }) It("updates coredns to the correct version", func() {