github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-24 22:14:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126449 from BenTheElder/coredns-1113

Browse Source 
update coreDNS to v1.11.3
This commit is contained in:
Kubernetes Prow Robot
2024-08-13 21:04:06 -07:00
committed by GitHub
parent 7576984eec b33ef18bdf
commit 046c098a45
12 changed files with 38 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/constants/constants.go
View File

@@ -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"

10
cmd/kubeadm/app/images/images_test.go
View File

@@ -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",
},
},
},

18
cmd/kubeadm/app/phases/addons/dns/dns_test.go
View File

@@ -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++ {