Skip to content

Commit 3727879

Browse files
authored
Merge pull request kubernetes#92651 from rajansandeep/kubeadm-coredns1.7.0
[Kubeadm]:Bump CoreDNS to v1.7.0
2 parents 4efed03 + 2d574a6 commit 3727879

File tree

9 files changed

+116
-22
lines changed

9 files changed

+116
-22
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
match: k8s.gcr.io/coredns
2323

2424
- name: "coredns-kubeadm"
25-
version: 1.6.7
25+
version: 1.7.0
2626
refPaths:
2727
- path: cmd/kubeadm/app/constants/constants.go
2828
match: CoreDNSVersion =

cmd/kubeadm/app/constants/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ const (
329329
KubeDNSVersion = "1.14.13"
330330

331331
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
332-
CoreDNSVersion = "1.6.7"
332+
CoreDNSVersion = "1.7.0"
333333

334334
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
335335
ClusterConfigurationKind = "ClusterConfiguration"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,9 @@ func TestCreateCoreDNSConfigMap(t *testing.T) {
585585
ttl 30
586586
}
587587
prometheus :9153
588-
forward . /etc/resolv.conf
588+
forward . /etc/resolv.conf {
589+
max_concurrent 1000
590+
}
589591
cache 30
590592
loop
591593
reload
@@ -623,7 +625,9 @@ func TestCreateCoreDNSConfigMap(t *testing.T) {
623625
fallthrough in-addr.arpa ip6.arpa
624626
}
625627
prometheus :9153
626-
forward . /etc/resolv.conf
628+
forward . /etc/resolv.conf {
629+
max_concurrent 1000
630+
}
627631
k8s_external example.com
628632
cache 30
629633
loop

cmd/kubeadm/app/phases/addons/dns/manifests.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,9 @@ data:
320320
ttl 30
321321
}
322322
prometheus :9153
323-
forward . {{ .UpstreamNameserver }}
323+
forward . {{ .UpstreamNameserver }} {
324+
max_concurrent 1000
325+
}
324326
cache 30
325327
loop
326328
reload

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/codegangsta/negroni v1.0.0 // indirect
3030
github.com/container-storage-interface/spec v1.2.0
3131
github.com/containernetworking/cni v0.8.0
32-
github.com/coredns/corefile-migration v1.0.8
32+
github.com/coredns/corefile-migration v1.0.10
3333
github.com/coreos/go-oidc v2.1.0+incompatible
3434
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
3535
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
@@ -209,7 +209,7 @@ replace (
209209
github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.0
210210
github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.0
211211
github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.0
212-
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.8
212+
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.10
213213
github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2
214214
github.com/coreos/etcd => github.com/coreos/etcd v3.3.10+incompatible
215215
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ github.com/containerd/typeurl v1.0.0 h1:7LMH7LfEmpWeCkGcIputvd4P0Rnd0LrIv1Jk2s5o
108108
github.com/containerd/typeurl v1.0.0/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
109109
github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=
110110
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
111-
github.com/coredns/corefile-migration v1.0.8 h1:y/DSRGlmrLPTMUGWR81MgFC2ITLiaTGkbth0BqW3wvc=
112-
github.com/coredns/corefile-migration v1.0.8/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
111+
github.com/coredns/corefile-migration v1.0.10 h1:7HI4r5S5Fne749a+JDxUZppqBpYoZK8Q53ZVK9cn3aM=
112+
github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI=
113113
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
114114
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
115115
github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=

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

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

vendor/github.com/coredns/corefile-migration/migration/versions.go

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

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ github.com/containernetworking/cni/pkg/types/020
169169
github.com/containernetworking/cni/pkg/types/current
170170
github.com/containernetworking/cni/pkg/utils
171171
github.com/containernetworking/cni/pkg/version
172-
# github.com/coredns/corefile-migration v1.0.8 => github.com/coredns/corefile-migration v1.0.8
172+
# github.com/coredns/corefile-migration v1.0.10 => github.com/coredns/corefile-migration v1.0.10
173173
github.com/coredns/corefile-migration/migration
174174
github.com/coredns/corefile-migration/migration/corefile
175175
# github.com/coreos/go-oidc v2.1.0+incompatible => github.com/coreos/go-oidc v2.1.0+incompatible

0 commit comments

Comments
 (0)