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.

Sign up for GitHub

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

Jump to bottom

support coredns v1.11.0 #76

Merged
merged 1 commit into from
Aug 22, 2023
Merged

support coredns v1.11.0 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion corefile-tool/cmd/validversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestNewValidVersionsCmd(t *testing.T) {
{
name: "Works without error",
expectedOutput: `The following are valid CoreDNS versions:
1.1.3, 1.1.4, 1.2.0, 1.2.1, 1.2.2, 1.2.3, 1.2.4, 1.2.5, 1.2.6, 1.3.0, 1.3.1, 1.4.0, 1.5.0, 1.5.1, 1.5.2, 1.6.0, 1.6.1, 1.6.2, 1.6.3, 1.6.4, 1.6.5, 1.6.6, 1.6.7, 1.6.9, 1.7.0, 1.7.1, 1.8.0, 1.8.3, 1.8.4, 1.8.5, 1.8.6, 1.8.7, 1.9.0, 1.9.1, 1.9.2, 1.9.3, 1.9.4, 1.10.0, 1.10.1
1.1.3, 1.1.4, 1.2.0, 1.2.1, 1.2.2, 1.2.3, 1.2.4, 1.2.5, 1.2.6, 1.3.0, 1.3.1, 1.4.0, 1.5.0, 1.5.1, 1.5.2, 1.6.0, 1.6.1, 1.6.2, 1.6.3, 1.6.4, 1.6.5, 1.6.6, 1.6.7, 1.6.9, 1.7.0, 1.7.1, 1.8.0, 1.8.3, 1.8.4, 1.8.5, 1.8.6, 1.8.7, 1.9.0, 1.9.1, 1.9.2, 1.9.3, 1.9.4, 1.10.0, 1.10.1, 1.11.0
`,
expectedError: false,
},
Expand Down
27 changes: 27 additions & 0 deletions migration/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -406,6 +426,13 @@ var plugins = map[string]map[string]plugin{
"ttl": {},
},
},
"v2": plugin{
namedOptions: map[string]option{
"apex": {},
"ttl": {},
"fallthrough": {}, // new option
},
},
},

"proxy": {
Expand Down
46 changes: 45 additions & 1 deletion migration/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,16 @@ 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.0": {
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",
Expand Down Expand Up @@ -745,6 +751,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
chrisohaver marked this conversation as resolved.
Show resolved Hide resolved
"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"],
chrisohaver marked this conversation as resolved.
Show resolved Hide resolved
"transfer": plugins["transfer"]["v1"],
}

var plugins_1_9_3 = map[string]plugin{
"errors": plugins["errors"]["v3"], // stacktrace option added
"log": plugins["log"]["v1"],
Expand Down
Loading