diff --git a/corefile-tool/cmd/validversions_test.go b/corefile-tool/cmd/validversions_test.go index 00a10e0..433d0e7 100644 --- a/corefile-tool/cmd/validversions_test.go +++ b/corefile-tool/cmd/validversions_test.go @@ -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.11.0, 1.11.1, 1.11.3 +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, 1.11.1, 1.11.3, 1.11.4, 1.12.0 `, expectedError: false, }, diff --git a/migration/plugins.go b/migration/plugins.go index 500b73c..7c62a63 100644 --- a/migration/plugins.go +++ b/migration/plugins.go @@ -311,12 +311,12 @@ var plugins = map[string]map[string]plugin{ }, "v3": plugin{ namedOptions: map[string]option{ - "type": {}, - "class": {}, - "name": {}, - "answer name": {}, - "edns0": {}, - "ttl": {}, + "type": {}, + "class": {}, + "name": {}, + "answer name": {}, + "edns0": {}, + "ttl": {}, "cname_target": {}, // new option }, }, @@ -351,7 +351,7 @@ var plugins = map[string]map[string]plugin{ "success": {}, "denial": {}, "prefetch": {}, - "serve_stale": {}, + "serve_stale": {}, "keepttl": {}, // new option }, }, @@ -417,6 +417,21 @@ var plugins = map[string]map[string]plugin{ }, }, }, + "v4": plugin{ + namedOptions: map[string]option{ + "except": {}, + "force_tcp": {}, + "prefer_udp": {}, + "expire": {}, + "max_fails": {}, + "tls": {}, + "tls_servername": {}, + "policy": {}, + "health_check": {}, + "max_concurrent": {}, + "next": {}, // new option + }, + }, }, "k8s_external": { @@ -428,8 +443,8 @@ var plugins = map[string]map[string]plugin{ }, "v2": plugin{ namedOptions: map[string]option{ - "apex": {}, - "ttl": {}, + "apex": {}, + "ttl": {}, "fallthrough": {}, // new option }, }, diff --git a/migration/versions.go b/migration/versions.go index 8b5226f..52f79a8 100644 --- a/migration/versions.go +++ b/migration/versions.go @@ -30,22 +30,34 @@ type release struct { // Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4) var Versions = map[string]release{ + "1.12.0": { + priorVersion: "1.11.4", + dockerImageSHA: "40384aa1f5ea6bfdc77997d243aec73da05f27aed0c5e9d65bfa98933c519d97", + plugins: plugins_1_11_4, + }, + "1.11.4": { + nextVersion: "1.12.0", + priorVersion: "1.11.3", + dockerImageSHA: "4190b960ea90e017631e3e1a38eea28e98e057ab60d57d47b3db6e5cf77436f7", + plugins: plugins_1_11_4, + }, "1.11.3": { + nextVersion: "1.11.4", priorVersion: "1.11.1", dockerImageSHA: "9caabbf6238b189a65d0d6e6ac138de60d6a1c419e5a341fbbb7c78382559c6e", - plugins: plugins_1_11_0, + plugins: plugins_1_11_0, }, "1.11.1": { nextVersion: "1.11.3", priorVersion: "1.11.0", dockerImageSHA: "1eeb4c7316bacb1d4c8ead65571cd92dd21e27359f0d4917f1a5822a73b75db1", - plugins: plugins_1_11_0, + plugins: plugins_1_11_0, }, "1.11.0": { nextVersion: "1.11.1", priorVersion: "1.10.1", dockerImageSHA: "cc3ebb05fbdba439d2d69813f162aa204b027098c8244fb3156e6e7c0f31c548", - plugins: plugins_1_11_0, + plugins: plugins_1_11_0, }, "1.10.1": { nextVersion: "1.11.0", @@ -763,6 +775,25 @@ var Versions = map[string]release{ }`}, } +var plugins_1_11_4 = 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"], + "prometheus": {}, + "forward": plugins["forward"]["v4"], // add next option + "cache": plugins["cache"]["v2"], + "loop": {}, + "reload": {}, + "loadbalance": {}, + "hosts": plugins["hosts"]["v1"], + "rewrite": plugins["rewrite"]["v3"], + "transfer": plugins["transfer"]["v1"], +} + var plugins_1_11_0 = map[string]plugin{ "errors": plugins["errors"]["v3"], "log": plugins["log"]["v1"],