Update coredns (eksctl-io#7179)

* Update coredns * fix unit test --------- Co-authored-by: Tibi <110664232+TiberiuGC@users.noreply.github.com>
TiberiuGC · Oct 18, 2023 · a60c425 · a60c425
1 parent 0d454a3
commit a60c425
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,

diff --git 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() {