From 3301161c36ac9c27854a7b4636139d4ebde43e72 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 | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 84758484da9..c75445da5e5 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 e0b7c8b298f..b2f0e12c284 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -360,7 +360,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 273f0a48a8f..a127f0d9923 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: kubeadmapiv1.DefaultImageRepository + "/coredns/coredns:v1.11.1", + expected: kubeadmapiv1.DefaultImageRepository + "/coredns/coredns:v1.11.3", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: kubeadmapiv1.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 cb61e5fae51..fc7b35137c9 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns_test.go @@ -701,7 +701,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: foo.bar.io/coredns:v1.11.1 + image: foo.bar.io/coredns:v1.11.3 imagePullPolicy: IfNotPresent resources: limits: @@ -985,7 +985,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: foo.bar.io/coredns:v1.11.1 + image: foo.bar.io/coredns:v1.11.3 imagePullPolicy: IfNotPresent resources: limits: @@ -1414,28 +1414,28 @@ func TestDeployedDNSAddon(t *testing.T) { }{ { name: "default", - image: "registry.k8s.io/coredns/coredns:v1.11.1", + image: "registry.k8s.io/coredns/coredns:v1.11.3", deploymentSize: 1, - wantVersion: "v1.11.1", + wantVersion: "v1.11.3", }, { name: "no dns addon deployment", - image: "registry.k8s.io/coredns/coredns:v1.11.1", + image: "registry.k8s.io/coredns/coredns:v1.11.3", deploymentSize: 0, wantVersion: "", }, { name: "multiple dns addon deployment", - image: "registry.k8s.io/coredns/coredns:v1.11.1", + image: "registry.k8s.io/coredns/coredns:v1.11.3", deploymentSize: 2, wantVersion: "", wantErr: true, }, { name: "with digest", - image: "registry.k8s.io/coredns/coredns:v1.11.1@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e", + image: "registry.k8s.io/coredns/coredns:v1.11.3@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e", deploymentSize: 1, - wantVersion: "v1.11.1", + wantVersion: "v1.11.3", }, { name: "without registry", @@ -1655,7 +1655,7 @@ func TestIsCoreDNSConfigMapMigrationRequired(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, configMap string, configData 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++ {