From 78538bd303d49ddb4c7cb9daaf212fa7d0c75895 Mon Sep 17 00:00:00 2001 From: "guangli.bao" Date: Wed, 23 Aug 2023 08:52:33 +0800 Subject: [PATCH] update coredns to v1.11.0 update coredns to v1.11.1 update coredns-kubeadm to 1.11.1 bump up corefile-migration to v1.0.21 based on https://github.com/coredns/corefile-migration/releases/tag/v1.0.21 fix dns_test ut failure Signed-off-by: guangli.bao --- build/dependencies.yaml | 4 +- cluster/addons/dns/coredns/coredns.yaml.base | 2 +- cluster/addons/dns/coredns/coredns.yaml.in | 2 +- cluster/addons/dns/coredns/coredns.yaml.sed | 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 | 4 +- go.mod | 2 +- go.sum | 4 +- .../corefile-migration/migration/plugins.go | 27 ++++++++++ .../corefile-migration/migration/versions.go | 52 ++++++++++++++++++- vendor/modules.txt | 2 +- 12 files changed, 95 insertions(+), 18 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 06be861bd9d..1804bdb9f1d 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -29,7 +29,7 @@ dependencies: # CoreDNS - name: "coredns-kube-up" - version: 1.10.1 + version: 1.11.1 refPaths: - path: cluster/addons/dns/coredns/coredns.yaml.base match: registry.k8s.io/coredns @@ -39,7 +39,7 @@ dependencies: match: registry.k8s.io/coredns - name: "coredns-kubeadm" - version: 1.10.1 + version: 1.11.1 refPaths: - path: cmd/kubeadm/app/constants/constants.go match: CoreDNSVersion = diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base index 69c0f456591..87cc327dd41 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.base +++ b/cluster/addons/dns/coredns/coredns.yaml.base @@ -133,7 +133,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: registry.k8s.io/coredns/coredns:v1.10.1 + image: registry.k8s.io/coredns/coredns:v1.11.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in index 98edc4e1a54..75bc5d75ba3 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.in +++ b/cluster/addons/dns/coredns/coredns.yaml.in @@ -133,7 +133,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: registry.k8s.io/coredns/coredns:v1.10.1 + image: registry.k8s.io/coredns/coredns:v1.11.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed index 021b35d0ba4..f98fe13410a 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.sed +++ b/cluster/addons/dns/coredns/coredns.yaml.sed @@ -133,7 +133,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: registry.k8s.io/coredns/coredns:v1.10.1 + image: registry.k8s.io/coredns/coredns:v1.11.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 0a2271115f4..3d1850f53ab 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -341,7 +341,7 @@ const ( CoreDNSImageName = "coredns" // CoreDNSVersion is the version of CoreDNS to be deployed if it is used - CoreDNSVersion = "v1.10.1" + CoreDNSVersion = "v1.11.1" // 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 3631a142e00..054ba81fcfb 100644 --- a/cmd/kubeadm/app/images/images_test.go +++ b/cmd/kubeadm/app/images/images_test.go @@ -242,21 +242,21 @@ func TestGetDNSImage(t *testing.T) { cfg *kubeadmapi.ClusterConfiguration }{ { - expected: "foo.io/coredns:v1.10.1", + expected: "foo.io/coredns:v1.11.1", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{}, }, }, { - expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.10.1", + expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.11.1", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: kubeadmapiv1beta3.DefaultImageRepository, DNS: kubeadmapi.DNS{}, }, }, { - expected: "foo.io/coredns/coredns:v1.10.1", + expected: "foo.io/coredns/coredns:v1.11.1", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io", DNS: kubeadmapi.DNS{ @@ -267,12 +267,12 @@ func TestGetDNSImage(t *testing.T) { }, }, { - expected: "foo.io/coredns/coredns:v1.11.0", + expected: "foo.io/coredns/coredns:v1.11.1", cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "foo.io/coredns", DNS: kubeadmapi.DNS{ ImageMeta: kubeadmapi.ImageMeta{ - ImageTag: "v1.11.0", + ImageTag: "v1.11.1", }, }, }, diff --git a/cmd/kubeadm/app/phases/addons/dns/dns_test.go b/cmd/kubeadm/app/phases/addons/dns/dns_test.go index 4f615a6774a..b4ce7f520ec 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns_test.go @@ -698,7 +698,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: daocloud.io/coredns:v1.10.1 + image: daocloud.io/coredns:v1.11.1 imagePullPolicy: IfNotPresent resources: limits: @@ -964,7 +964,7 @@ spec: kubernetes.io/os: linux containers: - name: coredns - image: daocloud.io/coredns:v1.10.1 + image: daocloud.io/coredns:v1.11.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/go.mod b/go.mod index fa64306fd2a..5ce68bfc473 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/container-storage-interface/spec v1.8.0 github.com/containerd/cgroups v1.1.0 - github.com/coredns/corefile-migration v1.0.20 + github.com/coredns/corefile-migration v1.0.21 github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-systemd/v22 v22.5.0 github.com/cpuguy83/go-md2man/v2 v2.0.2 diff --git a/go.sum b/go.sum index 8b9ed714cb2..760ea43a1b9 100644 --- a/go.sum +++ b/go.sum @@ -299,8 +299,8 @@ github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcD github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI= -github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= +github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE= +github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/vendor/github.com/coredns/corefile-migration/migration/plugins.go b/vendor/github.com/coredns/corefile-migration/migration/plugins.go index abfb04d8fcb..500b73c19b6 100644 --- a/vendor/github.com/coredns/corefile-migration/migration/plugins.go +++ b/vendor/github.com/coredns/corefile-migration/migration/plugins.go @@ -309,6 +309,17 @@ var plugins = map[string]map[string]plugin{ "ttl": {}, // new option }, }, + "v3": plugin{ + namedOptions: map[string]option{ + "type": {}, + "class": {}, + "name": {}, + "answer name": {}, + "edns0": {}, + "ttl": {}, + "cname_target": {}, // new option + }, + }, }, "log": { @@ -335,6 +346,15 @@ var plugins = map[string]map[string]plugin{ "serve_stale": {}, // new option }, }, + "v3": plugin{ + namedOptions: map[string]option{ + "success": {}, + "denial": {}, + "prefetch": {}, + "serve_stale": {}, + "keepttl": {}, // new option + }, + }, }, "forward": { @@ -406,6 +426,13 @@ var plugins = map[string]map[string]plugin{ "ttl": {}, }, }, + "v2": plugin{ + namedOptions: map[string]option{ + "apex": {}, + "ttl": {}, + "fallthrough": {}, // new option + }, + }, }, "proxy": { diff --git a/vendor/github.com/coredns/corefile-migration/migration/versions.go b/vendor/github.com/coredns/corefile-migration/migration/versions.go index 083d5da24fd..6d34f8525fe 100644 --- a/vendor/github.com/coredns/corefile-migration/migration/versions.go +++ b/vendor/github.com/coredns/corefile-migration/migration/versions.go @@ -30,10 +30,22 @@ type release struct { // Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4) var Versions = map[string]release{ + "1.11.1": { + priorVersion: "1.11.0", + dockerImageSHA: "1eeb4c7316bacb1d4c8ead65571cd92dd21e27359f0d4917f1a5822a73b75db1", + plugins: plugins_1_11_0, + }, + "1.11.0": { + nextVersion: "1.11.1", + priorVersion: "1.10.1", + dockerImageSHA: "cc3ebb05fbdba439d2d69813f162aa204b027098c8244fb3156e6e7c0f31c548", + plugins: plugins_1_11_0, + }, "1.10.1": { + nextVersion: "1.11.0", priorVersion: "1.10.0", dockerImageSHA: "a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e", - plugins: plugins_1_9_3, + plugins: plugins_1_10_1, }, "1.10.0": { nextVersion: "1.10.1", @@ -745,6 +757,44 @@ var Versions = map[string]release{ }`}, } +var plugins_1_11_0 = map[string]plugin{ + "errors": plugins["errors"]["v3"], + "log": plugins["log"]["v1"], + "health": plugins["health"]["v1"], + "ready": {}, + "autopath": {}, + "kubernetes": plugins["kubernetes"]["v8"], + "k8s_external": plugins["k8s_external"]["v2"], //add fallthrough option + "prometheus": {}, + "forward": plugins["forward"]["v3"], + "cache": plugins["cache"]["v2"], + "loop": {}, + "reload": {}, + "loadbalance": {}, + "hosts": plugins["hosts"]["v1"], + "rewrite": plugins["rewrite"]["v3"], // add cname_target option + "transfer": plugins["transfer"]["v1"], +} + +var plugins_1_10_1 = map[string]plugin{ + "errors": plugins["errors"]["v3"], + "log": plugins["log"]["v1"], + "health": plugins["health"]["v1"], + "ready": {}, + "autopath": {}, + "kubernetes": plugins["kubernetes"]["v8"], + "k8s_external": plugins["k8s_external"]["v1"], + "prometheus": {}, + "forward": plugins["forward"]["v3"], + "cache": plugins["cache"]["v2"], // add keepttl option + "loop": {}, + "reload": {}, + "loadbalance": {}, + "hosts": plugins["hosts"]["v1"], + "rewrite": plugins["rewrite"]["v2"], + "transfer": plugins["transfer"]["v1"], +} + var plugins_1_9_3 = map[string]plugin{ "errors": plugins["errors"]["v3"], // stacktrace option added "log": plugins["log"]["v1"], diff --git a/vendor/modules.txt b/vendor/modules.txt index 16a78f9d9c5..d86f6effa31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -156,7 +156,7 @@ github.com/containerd/ttrpc # github.com/coredns/caddy v1.1.1 ## explicit; go 1.13 github.com/coredns/caddy/caddyfile -# github.com/coredns/corefile-migration v1.0.20 +# github.com/coredns/corefile-migration v1.0.21 ## explicit; go 1.14 github.com/coredns/corefile-migration/migration github.com/coredns/corefile-migration/migration/corefile