From 322c524e71d4779de075c0b5634ae2f7b994a99a Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Jul 2024 13:38:05 -0700 Subject: [PATCH] kubeadm: bump coredns to 1.11.3 --- build/dependencies.yaml | 2 +- cmd/kubeadm/app/constants/constants.go | 2 +- cmd/kubeadm/app/images/images_test.go | 10 ++++----- cmd/kubeadm/app/phases/addons/dns/dns_test.go | 22 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index d9c9c4afe5e..bf6921db25e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -41,7 +41,7 @@ dependencies: match: registry.k8s.io/coredns - name: "coredns-kubeadm" - version: 1.11.1 + version: 1.11.3 refPaths: - path: cmd/kubeadm/app/constants/constants.go match: CoreDNSVersion = diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 70646c21145..6d0381a014b 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -358,7 +358,7 @@ const ( CoreDNSImageName = "coredns" // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.11.1" + CoreDNSVersion = "v1.11.3" // ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct ClusterConfigurationKind = "ClusterConfiguration" diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go index 0f8478a1a83..a08892e83c7 100644 --- a/cmd/kubeadm/app/images/images_test.go +++ b/cmd/kubeadm/app/images/images_test.go @@ -315,21 +315,21 @@ func TestGetDNSImage(t *testing.T) { cfg *kubeadmapi.ClusterConfiguration }{ { - expected: "foo.io/coredns:v1.11.1", + expected: "foo.io/coredns:v1.11.3", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{}, }, }, { - expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.11.1", + expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.11.3", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: kubeadmapiv1beta3.DefaultImageRepository, DNS: kubeadmapi.DNS{}, }, }, { - expected: "foo.io/coredns/coredns:v1.11.1", + expected: "foo.io/coredns/coredns:v1.11.3", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{ @@ -340,12 +340,12 @@ func TestGetDNSImage(t *testing.T) { }, }, { - expected: "foo.io/coredns/coredns:v1.11.1", + expected: "foo.io/coredns/coredns:v1.11.3", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io/coredns", DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageTag: "v1.11.1", + ImageTag: "v1.11.3", }, }, }, diff --git a/cmd/kubeadm/app/phases/addons/dns/dns_test.go b/cmd/kubeadm/app/phases/addons/dns/dns_test.go index e8e2d56943c..0b6c12eb41b 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns_test.go @@ -626,7 +626,7 @@ func TestCoreDNSAddon(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageRepository: "daocloud.io", + ImageRepository: "foo.bar.io", }, }, Networking: kubeadmapi.Networking{ @@ -645,7 +645,7 @@ func TestCoreDNSAddon(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageRepository: "daocloud.io", + ImageRepository: "foo.bar.io", }, }, Networking: kubeadmapi.Networking{ @@ -699,7 +699,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: daocloud.io/coredns:v1.11.1 + image: foo.bar.io/coredns:v1.11.3 imagePullPolicy: IfNotPresent resources: limits: @@ -892,7 +892,7 @@ func TestEnsureDNSAddon(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageRepository: "daocloud.io", + ImageRepository: "foo.bar.io", }, }, Networking: kubeadmapi.Networking{ @@ -910,7 +910,7 @@ func TestEnsureDNSAddon(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageRepository: "daocloud.io", + ImageRepository: "foo.bar.io", }, }, Networking: kubeadmapi.Networking{ @@ -964,7 +964,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: daocloud.io/coredns:v1.11.1 + image: foo.bar.io/coredns:v1.11.3 imagePullPolicy: IfNotPresent resources: limits: @@ -1392,13 +1392,13 @@ func TestDeployedDNSAddon(t *testing.T) { }{ { name: "default", - image: "registry.k8s.io/coredns/coredns:v1.11.1", - wantVersion: "v1.11.1", + image: "registry.k8s.io/coredns/coredns:v1.11.3", + wantVersion: "v1.11.3", }, { name: "with digest", - image: "registry.k8s.io/coredns/coredns:v1.11.1@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e", - wantVersion: "v1.11.1", + image: "registry.k8s.io/coredns/coredns:v1.11.3@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e", + wantVersion: "v1.11.3", }, { name: "without registry", @@ -1441,7 +1441,7 @@ func TestDeployedDNSAddon(t *testing.T) { // deploymentSize is the number of deployments with `k8s-app=kube-dns` label. func newMockClientForTest(t *testing.T, replicas int32, deploymentSize int, image string) *clientsetfake.Clientset { if image == "" { - image = "registry.k8s.io/coredns/coredns:v1.11.1" + image = "registry.k8s.io/coredns/coredns:v1.11.3" } client := clientsetfake.NewSimpleClientset() for i := 0; i < deploymentSize; i++ {