mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 09:52:49 +00:00
update the corefile-migration library to v1.0.10 which includes support for coredns up to v1.7.0
This commit is contained in:
Sandeep Rajan
parent
04038fc791
commit
2d574a647e
4
go.mod
4
go.mod
@ -29,7 +29,7 @@ require (
|
||||
github.com/codegangsta/negroni v1.0.0 // indirect
|
||||
github.com/container-storage-interface/spec v1.2.0
|
||||
github.com/containernetworking/cni v0.8.0
|
||||
github.com/coredns/corefile-migration v1.0.8
|
||||
github.com/coredns/corefile-migration v1.0.10
|
||||
github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
|
||||
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
|
||||
@ -209,7 +209,7 @@ replace (
|
||||
github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.0
|
||||
github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.0
|
||||
github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.0
|
||||
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.8
|
||||
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.10
|
||||
github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2
|
||||
github.com/coreos/etcd => github.com/coreos/etcd v3.3.10+incompatible
|
||||
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
|
||||
4
go.sum
4
go.sum
@ -108,8 +108,8 @@ github.com/containerd/typeurl v1.0.0 h1:7LMH7LfEmpWeCkGcIputvd4P0Rnd0LrIv1Jk2s5o
|
||||
github.com/containerd/typeurl v1.0.0/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
|
||||
github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=
|
||||
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
|
||||
github.com/coredns/corefile-migration v1.0.8 h1:y/DSRGlmrLPTMUGWR81MgFC2ITLiaTGkbth0BqW3wvc=
|
||||
github.com/coredns/corefile-migration v1.0.8/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
|
||||
github.com/coredns/corefile-migration v1.0.10 h1:7HI4r5S5Fne749a+JDxUZppqBpYoZK8Q53ZVK9cn3aM=
|
||||
github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI=
|
||||
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/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
|
||||
|
||||
33
vendor/github.com/coredns/corefile-migration/migration/plugins.go
generated
vendored
33
vendor/github.com/coredns/corefile-migration/migration/plugins.go
generated
vendored
@ -146,8 +146,8 @@ var plugins = map[string]map[string]plugin{
|
||||
},
|
||||
"v6": plugin{
|
||||
namedOptions: map[string]option{
|
||||
"resyncperiod": { // new removal
|
||||
status: removed,
|
||||
"resyncperiod": { // now ignored
|
||||
status: ignored,
|
||||
action: removeOption,
|
||||
},
|
||||
"endpoint": {
|
||||
@ -173,7 +173,10 @@ var plugins = map[string]map[string]plugin{
|
||||
},
|
||||
"v7": plugin{
|
||||
namedOptions: map[string]option{
|
||||
// resyncperiod removed
|
||||
"resyncperiod": { // new removal
|
||||
status: removed,
|
||||
action: removeOption,
|
||||
},
|
||||
"endpoint": {
|
||||
status: ignored,
|
||||
action: useFirstArgumentOnly,
|
||||
@ -184,8 +187,8 @@ var plugins = map[string]map[string]plugin{
|
||||
"labels": {},
|
||||
"pods": {},
|
||||
"endpoint_pod_names": {},
|
||||
"upstream": {
|
||||
status: ignored,
|
||||
"upstream": { // new removal
|
||||
status: removed,
|
||||
action: removeOption,
|
||||
},
|
||||
"ttl": {},
|
||||
@ -314,6 +317,26 @@ var plugins = map[string]map[string]plugin{
|
||||
"health_check": {},
|
||||
},
|
||||
},
|
||||
"v3": plugin{
|
||||
namedOptions: map[string]option{
|
||||
"except": {},
|
||||
"force_tcp": {},
|
||||
"prefer_udp": {},
|
||||
"expire": {},
|
||||
"max_fails": {},
|
||||
"tls": {},
|
||||
"tls_servername": {},
|
||||
"policy": {},
|
||||
"health_check": {},
|
||||
"max_concurrent": { // new option
|
||||
status: newdefault,
|
||||
add: func(c *corefile.Plugin) (*corefile.Plugin, error) {
|
||||
return addOptionToPlugin(c, &corefile.Option{Name: "max_concurrent 1000"})
|
||||
},
|
||||
downAction: removeOption,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
"k8s_external": {
|
||||
|
||||
79
vendor/github.com/coredns/corefile-migration/migration/versions.go
generated
vendored
79
vendor/github.com/coredns/corefile-migration/migration/versions.go
generated
vendored
@ -29,7 +29,72 @@ type release struct {
|
||||
|
||||
// Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4)
|
||||
var Versions = map[string]release{
|
||||
"1.7.0": {
|
||||
priorVersion: "1.6.9",
|
||||
k8sReleases: []string{"1.19"},
|
||||
dockerImageSHA: "73ca82b4ce829766d4f1f10947c3a338888f876fbed0540dc849c89ff256e90c",
|
||||
defaultConf: `.:53 {
|
||||
errors
|
||||
health {
|
||||
lameduck 5s
|
||||
}
|
||||
ready
|
||||
kubernetes * *** {
|
||||
pods insecure
|
||||
fallthrough in-addr.arpa ip6.arpa
|
||||
ttl 30
|
||||
}
|
||||
prometheus :9153
|
||||
forward . * {
|
||||
max_concurrent 1000
|
||||
}
|
||||
cache 30
|
||||
loop
|
||||
reload
|
||||
loadbalance
|
||||
}`,
|
||||
plugins: map[string]plugin{
|
||||
"errors": plugins["errors"]["v2"],
|
||||
"log": plugins["log"]["v1"],
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"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"],
|
||||
},
|
||||
},
|
||||
"1.6.9": {
|
||||
nextVersion: "1.7.0",
|
||||
priorVersion: "1.6.7",
|
||||
dockerImageSHA: "40ee1b708e20e3a6b8e04ccd8b6b3dd8fd25343eab27c37154946f232649ae21",
|
||||
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"]["v2"],
|
||||
"loop": {},
|
||||
"reload": {},
|
||||
"loadbalance": {},
|
||||
"hosts": plugins["hosts"]["v1"],
|
||||
"rewrite": plugins["rewrite"]["v2"],
|
||||
},
|
||||
},
|
||||
"1.6.7": {
|
||||
nextVersion: "1.6.9",
|
||||
priorVersion: "1.6.6",
|
||||
k8sReleases: []string{"1.18"},
|
||||
dockerImageSHA: "2c8d61c46f484d881db43b34d13ca47a269336e576c81cf007ca740fa9ec0800",
|
||||
@ -57,7 +122,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -79,7 +144,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -120,7 +185,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1 add lameduck"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -142,7 +207,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -164,7 +229,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -203,7 +268,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
@ -225,7 +290,7 @@ var Versions = map[string]release{
|
||||
"health": plugins["health"]["v1"],
|
||||
"ready": {},
|
||||
"autopath": {},
|
||||
"kubernetes": plugins["kubernetes"]["v7"],
|
||||
"kubernetes": plugins["kubernetes"]["v6"],
|
||||
"k8s_external": plugins["k8s_external"]["v1"],
|
||||
"prometheus": {},
|
||||
"forward": plugins["forward"]["v2"],
|
||||
|
||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -169,7 +169,7 @@ github.com/containernetworking/cni/pkg/types/020
|
||||
github.com/containernetworking/cni/pkg/types/current
|
||||
github.com/containernetworking/cni/pkg/utils
|
||||
github.com/containernetworking/cni/pkg/version
|
||||
# github.com/coredns/corefile-migration v1.0.8 => github.com/coredns/corefile-migration v1.0.8
|
||||
# github.com/coredns/corefile-migration v1.0.10 => github.com/coredns/corefile-migration v1.0.10
|
||||
github.com/coredns/corefile-migration/migration
|
||||
github.com/coredns/corefile-migration/migration/corefile
|
||||
# github.com/coreos/go-oidc v2.1.0+incompatible => github.com/coreos/go-oidc v2.1.0+incompatible
|
||||
|
||||
Loading…
Reference in New Issue
Block a user