Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CoreDNS version to 1.6.5 and update manifest #85108

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/dependencies.yaml
Expand Up @@ -73,7 +73,7 @@ dependencies:
match: k8s.gcr.io/coredns

- name: "coredns-kubeadm"
version: 1.6.2
version: 1.6.5
refPaths:
- path: cmd/kubeadm/app/constants/constants.go
match: CoreDNSVersion =
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/constants/constants.go
Expand Up @@ -334,7 +334,7 @@ const (
KubeDNSVersion = "1.14.13"

// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.6.2"
CoreDNSVersion = "1.6.5"

// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration"
Expand Down
8 changes: 6 additions & 2 deletions cmd/kubeadm/app/phases/addons/dns/dns_test.go
Expand Up @@ -632,7 +632,9 @@ func TestCreateCoreDNSConfigMap(t *testing.T) {
}`,
expectedCorefileData: `.:53 {
errors
health
health {
lameduck 5s
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a required change? will users with a custom dns config be broken if they don't make this change as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not required. It's just an improvement that reduces query failures during rolling upgrades. The setting allows CoreDNS to complete in flight dns queries before exiting.

Without the setting, CoreDNS will not be broken.

}
kubernetes cluster.local in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
Expand Down Expand Up @@ -669,7 +671,9 @@ func TestCreateCoreDNSConfigMap(t *testing.T) {
}`,
expectedCorefileData: `.:53 {
errors
health
health {
lameduck 5s
}
kubernetes cluster.local in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
Expand Down
4 changes: 3 additions & 1 deletion cmd/kubeadm/app/phases/addons/dns/manifests.go
Expand Up @@ -313,7 +313,9 @@ data:
Corefile: |
.:53 {
errors
health
health {
lameduck 5s
}
ready
kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
pods insecure
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Expand Up @@ -36,7 +36,7 @@ require (
github.com/containerd/containerd v1.0.2 // indirect
github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 // indirect
github.com/containernetworking/cni v0.7.1
github.com/coredns/corefile-migration v1.0.2
github.com/coredns/corefile-migration v1.0.4
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea
github.com/coreos/rkt v1.30.0 // indirect
Expand Down Expand Up @@ -225,7 +225,7 @@ replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.0.2
github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20
github.com/containernetworking/cni => github.com/containernetworking/cni v0.7.1
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.2
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.4
github.com/coreos/etcd => github.com/coreos/etcd v3.3.10+incompatible
github.com/coreos/go-etcd => github.com/coreos/go-etcd v2.0.0+incompatible
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -100,8 +100,8 @@ github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 h1:14r0i3IeJj6z
github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=
github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
github.com/coredns/corefile-migration v1.0.2 h1:kQga1ATFIZdkBtU6c/oJdtASLcCRkDh3fW8vVyVdvUc=
github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
github.com/coredns/corefile-migration v1.0.4 h1:GpAwsgzgLA9HOnt3+Z69xsMVLl0doNnyVfBX79d/P5A=
github.com/coredns/corefile-migration v1.0.4/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.