mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
Merge pull request #110489 from pacoxu/kubeadm-coredns-v1.9.3
kubeadm: upgrade coredns to v1.9.3
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
f15b0d1bd7
@ -39,7 +39,7 @@ dependencies:
|
||||
match: registry.k8s.io/coredns
|
||||
|
||||
- name: "coredns-kubeadm"
|
||||
version: 1.8.6
|
||||
version: 1.9.3
|
||||
refPaths:
|
||||
- path: cmd/kubeadm/app/constants/constants.go
|
||||
match: CoreDNSVersion =
|
||||
|
||||
@ -347,7 +347,7 @@ const (
|
||||
CoreDNSImageName = "coredns"
|
||||
|
||||
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
|
||||
CoreDNSVersion = "v1.8.6"
|
||||
CoreDNSVersion = "v1.9.3"
|
||||
|
||||
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
||||
ClusterConfigurationKind = "ClusterConfiguration"
|
||||
|
||||
@ -233,7 +233,7 @@ func TestGetDNSImage(t *testing.T) {
|
||||
cfg *kubeadmapi.ClusterConfiguration
|
||||
}{
|
||||
{
|
||||
expected: "foo.io/coredns:v1.8.6",
|
||||
expected: "foo.io/coredns:v1.9.3",
|
||||
cfg: &kubeadmapi.ClusterConfiguration{
|
||||
ImageRepository: "foo.io",
|
||||
DNS: kubeadmapi.DNS{
|
||||
@ -242,7 +242,7 @@ func TestGetDNSImage(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.6",
|
||||
expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.9.3",
|
||||
cfg: &kubeadmapi.ClusterConfiguration{
|
||||
ImageRepository: kubeadmapiv1beta2.DefaultImageRepository,
|
||||
DNS: kubeadmapi.DNS{
|
||||
@ -251,7 +251,7 @@ func TestGetDNSImage(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
expected: "foo.io/coredns/coredns:v1.8.6",
|
||||
expected: "foo.io/coredns/coredns:v1.9.3",
|
||||
cfg: &kubeadmapi.ClusterConfiguration{
|
||||
ImageRepository: "foo.io",
|
||||
DNS: kubeadmapi.DNS{
|
||||
|
||||
4
go.mod
4
go.mod
@ -24,7 +24,7 @@ require (
|
||||
github.com/blang/semver/v4 v4.0.0
|
||||
github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313
|
||||
github.com/container-storage-interface/spec v1.6.0
|
||||
github.com/coredns/corefile-migration v1.0.14
|
||||
github.com/coredns/corefile-migration v1.0.17
|
||||
github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
github.com/coreos/go-systemd/v22 v22.3.2
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.1
|
||||
@ -328,7 +328,7 @@ replace (
|
||||
github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
|
||||
github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.2
|
||||
github.com/coredns/caddy => github.com/coredns/caddy v1.1.0
|
||||
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.14
|
||||
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.17
|
||||
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0
|
||||
github.com/coreos/go-systemd/v22 => github.com/coreos/go-systemd/v22 v22.3.2
|
||||
|
||||
4
go.sum
4
go.sum
@ -112,8 +112,8 @@ github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY
|
||||
github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
|
||||
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
|
||||
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
|
||||
github.com/coredns/corefile-migration v1.0.14 h1:Tz3WZhoj2NdP8drrQH86NgnCng+VrPjNeg2Oe1ALKag=
|
||||
github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
|
||||
github.com/coredns/corefile-migration v1.0.17 h1:tNwh8+4WOANV6NjSljwgW7qViJfhvPUt1kosj4rR8yg=
|
||||
github.com/coredns/corefile-migration v1.0.17/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
|
||||
github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
|
||||
github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
|
||||
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
|
||||
|
||||
6
vendor/github.com/coredns/corefile-migration/migration/plugins.go
generated
vendored
6
vendor/github.com/coredns/corefile-migration/migration/plugins.go
generated
vendored
@ -247,6 +247,12 @@ var plugins = map[string]map[string]plugin{
|
||||
"consolidate": {},
|
||||
},
|
||||
},
|
||||
"v3": plugin{
|
||||
namedOptions: map[string]option{
|
||||
"consolidate": {},
|
||||
"stacktrace": {},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
"health": {
|
||||
|
||||
222
vendor/github.com/coredns/corefile-migration/migration/versions.go
generated
vendored
222
vendor/github.com/coredns/corefile-migration/migration/versions.go
generated
vendored
@ -30,11 +30,11 @@ type release struct {
|
||||
|
||||
// Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4)
|
||||
var Versions = map[string]release{
|
||||
"1.8.6": {
|
||||
priorVersion: "1.8.5",
|
||||
dockerImageSHA: "5b6ec0d6de9baaf3e92d0f66cd96a25b9edbce8716f5f15dcd1a616b3abd590e",
|
||||
"1.9.3": {
|
||||
priorVersion: "1.9.2",
|
||||
dockerImageSHA: "8e352a029d304ca7431c6507b56800636c321cb52289686a581ab70aaa8a2e2a",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"errors": plugins["errors"]["v3"], // stacktrace option added
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
@ -52,74 +52,53 @@ var Versions = map[string]release{
|
||||
"transfer": plugins["transfer"]["v1"],
|
||||
},
|
||||
},
|
||||
"1.9.2": {
|
||||
nextVersion: "1.9.3",
|
||||
priorVersion: "1.9.1",
|
||||
dockerImageSHA: "27340bfb3d563684973da8222bfed30c8b38e211d39e6dc2e632d0beef4cdca0",
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.9.1": {
|
||||
nextVersion: "1.9.2",
|
||||
priorVersion: "1.9.0",
|
||||
dockerImageSHA: "d5a7db9ab4cb3efc22a08707385c54c328db3df32841d6c4a8ae78f102f1f49a",
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.9.0": {
|
||||
nextVersion: "1.9.1",
|
||||
priorVersion: "1.8.7",
|
||||
dockerImageSHA: "0f101fabf4b63883d4529435f75b1e8816dcc8915e8fa7d28aa6e50a15e9ea6a",
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.7": {
|
||||
nextVersion: "1.9.0",
|
||||
priorVersion: "1.8.6",
|
||||
dockerImageSHA: "58508c172b14716350dc5185baefd78265a703514281d309d1d54aa1b721ad68",
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.6": {
|
||||
nextVersion: "1.8.7",
|
||||
priorVersion: "1.8.5",
|
||||
dockerImageSHA: "5b6ec0d6de9baaf3e92d0f66cd96a25b9edbce8716f5f15dcd1a616b3abd590e",
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.5": {
|
||||
nextVersion: "1.8.6",
|
||||
priorVersion: "1.8.4",
|
||||
dockerImageSHA: "43a9f52f5dce39bf1816afe6141724cc2d08811e466dd46e6628c925e2419bdc",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"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"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
"transfer": plugins["transfer"]["v1"],
|
||||
},
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.4": {
|
||||
nextVersion: "1.8.5",
|
||||
priorVersion: "1.8.3",
|
||||
dockerImageSHA: "6e5a02c21641597998b4be7cb5eb1e7b02c0d8d23cce4dd09f4682d463798890",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"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"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
"transfer": plugins["transfer"]["v1"],
|
||||
},
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.3": {
|
||||
nextVersion: "1.8.4",
|
||||
priorVersion: "1.8.0", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
|
||||
dockerImageSHA: "642ff9910da6ea9a8624b0234eef52af9ca75ecbec474c5507cb096bdfbae4e5",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"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"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
"transfer": plugins["transfer"]["v1"],
|
||||
},
|
||||
plugins: plugins_1_8_3,
|
||||
},
|
||||
"1.8.0": {
|
||||
nextVersion: "1.8.3", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
|
||||
@ -341,45 +320,13 @@ var Versions = map[string]release{
|
||||
nextVersion: "1.6.5",
|
||||
priorVersion: "1.6.3",
|
||||
dockerImageSHA: "493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
plugins: plugins_1_6_0,
|
||||
},
|
||||
"1.6.3": {
|
||||
nextVersion: "1.6.4",
|
||||
priorVersion: "1.6.2",
|
||||
dockerImageSHA: "cfa7236dab4e3860881fdf755880ff8361e42f6cba2e3775ae48e2d46d22f7ba",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
plugins: plugins_1_6_0,
|
||||
},
|
||||
"1.6.2": {
|
||||
nextVersion: "1.6.3",
|
||||
@ -402,67 +349,19 @@ var Versions = map[string]release{
|
||||
reload
|
||||
loadbalance
|
||||
}`,
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
plugins: plugins_1_6_0,
|
||||
},
|
||||
"1.6.1": {
|
||||
nextVersion: "1.6.2",
|
||||
priorVersion: "1.6.0",
|
||||
dockerImageSHA: "9ae3b6fcac4ee821362277de6bd8fd2236fa7d3e19af2ef0406d80b595620a7a",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
plugins: plugins_1_6_0,
|
||||
},
|
||||
"1.6.0": {
|
||||
nextVersion: "1.6.1",
|
||||
priorVersion: "1.5.2",
|
||||
dockerImageSHA: "263d03f2b889a75a0b91e035c2a14d45d7c1559c53444c5f7abf3a76014b779d",
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
plugins: plugins_1_6_0,
|
||||
},
|
||||
"1.5.2": {
|
||||
nextVersion: "1.6.0",
|
||||
@ -844,3 +743,40 @@ var Versions = map[string]release{
|
||||
reload
|
||||
}`},
|
||||
}
|
||||
|
||||
var plugins_1_8_3 = map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"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"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
"transfer": plugins["transfer"]["v1"],
|
||||
}
|
||||
|
||||
var plugins_1_6_0 = map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
"cache": plugins["cache"]["v1"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
}
|
||||
|
||||
4
vendor/modules.txt
vendored
4
vendor/modules.txt
vendored
@ -216,7 +216,7 @@ github.com/containerd/ttrpc
|
||||
# github.com/coredns/caddy v1.1.0 => github.com/coredns/caddy v1.1.0
|
||||
## explicit; go 1.13
|
||||
github.com/coredns/caddy/caddyfile
|
||||
# github.com/coredns/corefile-migration v1.0.14 => github.com/coredns/corefile-migration v1.0.14
|
||||
# github.com/coredns/corefile-migration v1.0.17 => github.com/coredns/corefile-migration v1.0.17
|
||||
## explicit; go 1.14
|
||||
github.com/coredns/corefile-migration/migration
|
||||
github.com/coredns/corefile-migration/migration/corefile
|
||||
@ -2613,7 +2613,7 @@ sigs.k8s.io/yaml
|
||||
# github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
|
||||
# github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.2
|
||||
# github.com/coredns/caddy => github.com/coredns/caddy v1.1.0
|
||||
# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.14
|
||||
# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.17
|
||||
# github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
# github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0
|
||||
# github.com/coreos/go-systemd/v22 => github.com/coreos/go-systemd/v22 v22.3.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user