Skip to content

Commit 74f6d48

Browse files
committed
support coredns v1.14.0 and v1.14.1
Signed-off-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
1 parent d633b7c commit 74f6d48

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
lines changed

corefile-tool/cmd/validversions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestNewValidVersionsCmd(t *testing.T) {
1515
{
1616
name: "Works without error",
1717
expectedOutput: `The following are valid CoreDNS versions:
18-
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, 1.12.1, 1.12.2, 1.12.3, 1.12.4. 1.13.0, 1.13.1, 1.13.2
18+
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, 1.12.1, 1.12.2, 1.12.3, 1.12.4. 1.13.0, 1.13.1, 1.13.2, 1.14.0, 1.14.1
1919
`,
2020
expectedError: false,
2121
},

migration/versions.go

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,19 @@ type release struct {
3030

3131
// Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4)
3232
var Versions = map[string]release{
33+
"1.14.1": {
34+
priorVersion: "1.14.0",
35+
dockerImageSHA: "82b57287b29beb757c740dbbe68f2d4723da94715b563fffad5c13438b71b14a",
36+
plugins: plugins_1_14_0,
37+
},
38+
"1.14.0": {
39+
nextVersion: "1.14.1",
40+
priorVersion: "1.13.2",
41+
dockerImageSHA: "4fbdd8fb53c5d1748aeb98f0799798fb073bb11128c13e8415aa254ad1ae0203",
42+
plugins: plugins_1_14_0,
43+
},
3344
"1.13.2": {
45+
nextVersion: "1.14.0",
3446
priorVersion: "1.13.1",
3547
dockerImageSHA: "94caebb89dcfb9d2c4be45bfda34410a3e1092458fbbbc0284365c9e4c9a7818",
3648
plugins: plugins_1_13_0,
@@ -812,11 +824,30 @@ var Versions = map[string]release{
812824
}
813825
prometheus :9153
814826
proxy . *
815-
cache 30
816-
reload
827+
cache 30
828+
reload
817829
}`},
818830
}
819831

832+
var plugins_1_14_0 = map[string]plugin{
833+
"errors": plugins["errors"]["v3"],
834+
"log": plugins["log"]["v1"],
835+
"health": plugins["health"]["v1"],
836+
"ready": {},
837+
"autopath": {},
838+
"kubernetes": plugins["kubernetes"]["v8"],
839+
"k8s_external": plugins["k8s_external"]["v2"],
840+
"prometheus": {},
841+
"forward": plugins["forward"]["v5"],
842+
"cache": plugins["cache"]["v4"],
843+
"loop": {},
844+
"reload": {},
845+
"loadbalance": {},
846+
"hosts": plugins["hosts"]["v1"],
847+
"rewrite": plugins["rewrite"]["v3"],
848+
"transfer": plugins["transfer"]["v1"],
849+
}
850+
820851
var plugins_1_13_0 = map[string]plugin{
821852
"errors": plugins["errors"]["v3"],
822853
"log": plugins["log"]["v1"],

0 commit comments

Comments
 (0)