github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

update coredns to v1.11.0

Browse Source 
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 <guangli.bao@daocloud.io>
This commit is contained in:
guangli.bao 2023-08-23 08:52:33 +08:00
parent fb785f1f42
commit 78538bd303
12 changed files with 95 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.yaml
View File

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

2
cluster/addons/dns/coredns/coredns.yaml.base
View File

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

2
cluster/addons/dns/coredns/coredns.yaml.in
View File

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

2
cluster/addons/dns/coredns/coredns.yaml.sed
View File

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

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

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

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

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

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

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

2
go.mod
View File

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

4
go.sum
View File

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

27
vendor/github.com/coredns/corefile-migration/migration/plugins.go generated vendored
View File

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

52
vendor/github.com/coredns/corefile-migration/migration/versions.go generated vendored
View File

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

2
vendor/modules.txt vendored
View File

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