Skip to content

Commit b733c4a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#128926 from bzsuni/bz/coredns/update/1.12.0
Update coredns to 1.12.0
2 parents fc7520b + fb47caa commit b733c4a

File tree

12 files changed

+121
-44
lines changed

12 files changed

+121
-44
lines changed

‎build/dependencies.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131

3232
# CoreDNS
3333
- name: "coredns-kube-up"
34-
version: 1.11.3
34+
version: 1.12.0
3535
refPaths:
3636
- path: cluster/addons/dns/coredns/coredns.yaml.base
3737
match: registry.k8s.io/coredns
@@ -41,7 +41,7 @@ dependencies:
4141
match: registry.k8s.io/coredns
4242

4343
- name: "coredns-kubeadm"
44-
version: 1.11.3
44+
version: 1.12.0
4545
refPaths:
4646
- path: cmd/kubeadm/app/constants/constants.go
4747
match: CoreDNSVersion =

‎cluster/addons/dns/coredns/coredns.yaml.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ spec:
133133
kubernetes.io/os: linux
134134
containers:
135135
- name: coredns
136-
image: registry.k8s.io/coredns/coredns:v1.11.3
136+
image: registry.k8s.io/coredns/coredns:v1.12.0
137137
imagePullPolicy: IfNotPresent
138138
resources:
139139
limits:

‎cluster/addons/dns/coredns/coredns.yaml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ spec:
133133
kubernetes.io/os: linux
134134
containers:
135135
- name: coredns
136-
image: registry.k8s.io/coredns/coredns:v1.11.3
136+
image: registry.k8s.io/coredns/coredns:v1.12.0
137137
imagePullPolicy: IfNotPresent
138138
resources:
139139
limits:

‎cluster/addons/dns/coredns/coredns.yaml.sed‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ spec:
133133
kubernetes.io/os: linux
134134
containers:
135135
- name: coredns
136-
image: registry.k8s.io/coredns/coredns:v1.11.3
136+
image: registry.k8s.io/coredns/coredns:v1.12.0
137137
imagePullPolicy: IfNotPresent
138138
resources:
139139
limits:

‎cmd/kubeadm/app/constants/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ const (
364364
CoreDNSImageName = "coredns"
365365

366366
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
367-
CoreDNSVersion = "v1.11.3"
367+
CoreDNSVersion = "v1.12.0"
368368

369369
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
370370
ClusterConfigurationKind = "ClusterConfiguration"

‎cmd/kubeadm/app/images/images_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,21 +315,21 @@ func TestGetDNSImage(t *testing.T) {
315315
cfg *kubeadmapi.ClusterConfiguration
316316
}{
317317
{
318-
expected: "foo.io/coredns:v1.11.3",
318+
expected: "foo.io/coredns:" + constants.CoreDNSVersion,
319319
cfg: &kubeadmapi.ClusterConfiguration{
320320
ImageRepository: "foo.io",
321321
DNS: kubeadmapi.DNS{},
322322
},
323323
},
324324
{
325-
expected: kubeadmapiv1.DefaultImageRepository + "/coredns/coredns:v1.11.3",
325+
expected: kubeadmapiv1.DefaultImageRepository + "/coredns/coredns:" + constants.CoreDNSVersion,
326326
cfg: &kubeadmapi.ClusterConfiguration{
327327
ImageRepository: kubeadmapiv1.DefaultImageRepository,
328328
DNS: kubeadmapi.DNS{},
329329
},
330330
},
331331
{
332-
expected: "foo.io/coredns/coredns:v1.11.3",
332+
expected: "foo.io/coredns/coredns:" + constants.CoreDNSVersion,
333333
cfg: &kubeadmapi.ClusterConfiguration{
334334
ImageRepository: "foo.io",
335335
DNS: kubeadmapi.DNS{
@@ -340,12 +340,12 @@ func TestGetDNSImage(t *testing.T) {
340340
},
341341
},
342342
{
343-
expected: "foo.io/coredns/coredns:v1.11.3",
343+
expected: "foo.io/coredns/coredns:" + constants.CoreDNSVersion,
344344
cfg: &kubeadmapi.ClusterConfiguration{
345345
ImageRepository: "foo.io/coredns",
346346
DNS: kubeadmapi.DNS{
347347
ImageMeta: kubeadmapi.ImageMeta{
348-
ImageTag: "v1.11.3",
348+
ImageTag: constants.CoreDNSVersion,
349349
},
350350
},
351351
},

‎cmd/kubeadm/app/phases/addons/dns/dns_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ func TestCoreDNSAddon(t *testing.T) {
666666
client: newMockClientForTest(t, 2, 1, "", "", ""),
667667
printManifest: true,
668668
},
669-
wantOut: dedent.Dedent(`---
669+
wantOut: dedent.Dedent(fmt.Sprintf(`---
670670
apiVersion: apps/v1
671671
kind: Deployment
672672
metadata:
@@ -710,7 +710,7 @@ spec:
710710
kubernetes.io/os: linux
711711
containers:
712712
- name: coredns
713-
image: foo.bar.io/coredns:v1.11.3
713+
image: foo.bar.io/coredns:%s
714714
imagePullPolicy: IfNotPresent
715715
resources:
716716
limits:
@@ -866,7 +866,7 @@ kind: ServiceAccount
866866
metadata:
867867
name: coredns
868868
namespace: kube-system
869-
`),
869+
`, kubeadmconstants.CoreDNSVersion)),
870870
wantErr: false,
871871
},
872872
}
@@ -950,7 +950,7 @@ func TestEnsureDNSAddon(t *testing.T) {
950950
client: newMockClientForTest(t, 0, 1, "", "", ""),
951951
printManifest: true,
952952
},
953-
wantOut: dedent.Dedent(`---
953+
wantOut: dedent.Dedent(fmt.Sprintf(`---
954954
apiVersion: apps/v1
955955
kind: Deployment
956956
metadata:
@@ -994,7 +994,7 @@ spec:
994994
kubernetes.io/os: linux
995995
containers:
996996
- name: coredns
997-
image: foo.bar.io/coredns:v1.11.3
997+
image: foo.bar.io/coredns:%s
998998
imagePullPolicy: IfNotPresent
999999
resources:
10001000
limits:
@@ -1150,7 +1150,7 @@ kind: ServiceAccount
11501150
metadata:
11511151
name: coredns
11521152
namespace: kube-system
1153-
`),
1153+
`, kubeadmconstants.CoreDNSVersion)),
11541154
wantErr: false,
11551155
},
11561156
}
@@ -1423,28 +1423,28 @@ func TestDeployedDNSAddon(t *testing.T) {
14231423
}{
14241424
{
14251425
name: "default",
1426-
image: "registry.k8s.io/coredns/coredns:v1.11.3",
1426+
image: "registry.k8s.io/coredns/coredns:" + kubeadmconstants.CoreDNSVersion,
14271427
deploymentSize: 1,
1428-
wantVersion: "v1.11.3",
1428+
wantVersion: kubeadmconstants.CoreDNSVersion,
14291429
},
14301430
{
14311431
name: "no dns addon deployment",
1432-
image: "registry.k8s.io/coredns/coredns:v1.11.3",
1432+
image: "registry.k8s.io/coredns/coredns:" + kubeadmconstants.CoreDNSVersion,
14331433
deploymentSize: 0,
14341434
wantVersion: "",
14351435
},
14361436
{
14371437
name: "multiple dns addon deployment",
1438-
image: "registry.k8s.io/coredns/coredns:v1.11.3",
1438+
image: "registry.k8s.io/coredns/coredns:" + kubeadmconstants.CoreDNSVersion,
14391439
deploymentSize: 2,
14401440
wantVersion: "",
14411441
wantErr: true,
14421442
},
14431443
{
14441444
name: "with digest",
1445-
image: "registry.k8s.io/coredns/coredns:v1.11.3@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e",
1445+
image: "registry.k8s.io/coredns/coredns:v1.12.0@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e",
14461446
deploymentSize: 1,
1447-
wantVersion: "v1.11.3",
1447+
wantVersion: kubeadmconstants.CoreDNSVersion,
14481448
},
14491449
{
14501450
name: "without registry",
@@ -1664,7 +1664,7 @@ func TestIsCoreDNSConfigMapMigrationRequired(t *testing.T) {
16641664
// deploymentSize is the number of deployments with `k8s-app=kube-dns` label.
16651665
func newMockClientForTest(t *testing.T, replicas int32, deploymentSize int, image string, configMap string, configData string) *clientsetfake.Clientset {
16661666
if image == "" {
1667-
image = "registry.k8s.io/coredns/coredns:v1.11.3"
1667+
image = "registry.k8s.io/coredns/coredns:" + kubeadmconstants.CoreDNSVersion
16681668
}
16691669
client := clientsetfake.NewSimpleClientset()
16701670
for i := 0; i < deploymentSize; i++ {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
2222
github.com/blang/semver/v4 v4.0.0
2323
github.com/container-storage-interface/spec v1.9.0
24-
github.com/coredns/corefile-migration v1.0.24
24+
github.com/coredns/corefile-migration v1.0.25
2525
github.com/coreos/go-oidc v2.2.1+incompatible
2626
github.com/coreos/go-systemd/v22 v22.5.0
2727
github.com/cpuguy83/go-md2man/v2 v2.0.4

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsP
193193
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
194194
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
195195
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
196-
github.com/coredns/corefile-migration v1.0.24 h1:NL/zRKijhJZLYlNnMr891DRv5jXgfd3Noons1M6oTpc=
197-
github.com/coredns/corefile-migration v1.0.24/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
196+
github.com/coredns/corefile-migration v1.0.25 h1:/XexFhM8FFlFLTS/zKNEWgIZ8Gl5GaWrHsMarGj/PRQ=
197+
github.com/coredns/corefile-migration v1.0.25/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
198198
github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
199199
github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
200200
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=

‎vendor/github.com/coredns/corefile-migration/migration/plugins.go‎

Lines changed: 36 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)