Skip to content

Commit 361ddfb

Browse files
chrisohaverchrisohaver
authored
add 1.9.2, redux highly reused plugin lists to variables (#67)
Signed-off-by: Chris O'Haver <[email protected]>
1 parent d73d557 commit 361ddfb

File tree

2 files changed

+56
-212
lines changed

2 files changed

+56
-212
lines changed

‎corefile-tool/cmd/validversions_test.go

+1-1
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
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
1919
`,
2020
expectedError: false,
2121
},

‎migration/versions.go

+55-211
Original file line numberDiff line numberDiff line change
@@ -30,165 +30,52 @@ 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.9.2": {
34+
priorVersion: "1.9.1",
35+
dockerImageSHA: "27340bfb3d563684973da8222bfed30c8b38e211d39e6dc2e632d0beef4cdca0",
36+
plugins: plugins_1_8_3,
37+
},
3338
"1.9.1": {
39+
nextVersion: "1.9.2",
3440
priorVersion: "1.9.0",
3541
dockerImageSHA: "d5a7db9ab4cb3efc22a08707385c54c328db3df32841d6c4a8ae78f102f1f49a",
36-
plugins: map[string]plugin{
37-
"errors": plugins["errors"]["v2"],
38-
"log": plugins["log"]["v1"],
39-
"health": plugins["health"]["v1"],
40-
"ready": {},
41-
"autopath": {},
42-
"kubernetes": plugins["kubernetes"]["v8"],
43-
"k8s_external": plugins["k8s_external"]["v1"],
44-
"prometheus": {},
45-
"forward": plugins["forward"]["v3"],
46-
"cache": plugins["cache"]["v1"],
47-
"loop": {},
48-
"reload": {},
49-
"loadbalance": {},
50-
"hosts": plugins["hosts"]["v1"],
51-
"rewrite": plugins["rewrite"]["v2"],
52-
"transfer": plugins["transfer"]["v1"],
53-
},
42+
plugins: plugins_1_8_3,
5443
},
5544
"1.9.0": {
5645
nextVersion: "1.9.1",
5746
priorVersion: "1.8.7",
5847
dockerImageSHA: "0f101fabf4b63883d4529435f75b1e8816dcc8915e8fa7d28aa6e50a15e9ea6a",
59-
plugins: map[string]plugin{
60-
"errors": plugins["errors"]["v2"],
61-
"log": plugins["log"]["v1"],
62-
"health": plugins["health"]["v1"],
63-
"ready": {},
64-
"autopath": {},
65-
"kubernetes": plugins["kubernetes"]["v8"],
66-
"k8s_external": plugins["k8s_external"]["v1"],
67-
"prometheus": {},
68-
"forward": plugins["forward"]["v3"],
69-
"cache": plugins["cache"]["v1"],
70-
"loop": {},
71-
"reload": {},
72-
"loadbalance": {},
73-
"hosts": plugins["hosts"]["v1"],
74-
"rewrite": plugins["rewrite"]["v2"],
75-
"transfer": plugins["transfer"]["v1"],
76-
},
48+
plugins: plugins_1_8_3,
7749
},
7850
"1.8.7": {
7951
nextVersion: "1.9.0",
8052
priorVersion: "1.8.6",
8153
dockerImageSHA: "58508c172b14716350dc5185baefd78265a703514281d309d1d54aa1b721ad68",
82-
plugins: map[string]plugin{
83-
"errors": plugins["errors"]["v2"],
84-
"log": plugins["log"]["v1"],
85-
"health": plugins["health"]["v1"],
86-
"ready": {},
87-
"autopath": {},
88-
"kubernetes": plugins["kubernetes"]["v8"],
89-
"k8s_external": plugins["k8s_external"]["v1"],
90-
"prometheus": {},
91-
"forward": plugins["forward"]["v3"],
92-
"cache": plugins["cache"]["v1"],
93-
"loop": {},
94-
"reload": {},
95-
"loadbalance": {},
96-
"hosts": plugins["hosts"]["v1"],
97-
"rewrite": plugins["rewrite"]["v2"],
98-
"transfer": plugins["transfer"]["v1"],
99-
},
54+
plugins: plugins_1_8_3,
10055
},
10156
"1.8.6": {
10257
nextVersion: "1.8.7",
10358
priorVersion: "1.8.5",
10459
dockerImageSHA: "5b6ec0d6de9baaf3e92d0f66cd96a25b9edbce8716f5f15dcd1a616b3abd590e",
105-
plugins: map[string]plugin{
106-
"errors": plugins["errors"]["v2"],
107-
"log": plugins["log"]["v1"],
108-
"health": plugins["health"]["v1"],
109-
"ready": {},
110-
"autopath": {},
111-
"kubernetes": plugins["kubernetes"]["v8"],
112-
"k8s_external": plugins["k8s_external"]["v1"],
113-
"prometheus": {},
114-
"forward": plugins["forward"]["v3"],
115-
"cache": plugins["cache"]["v1"],
116-
"loop": {},
117-
"reload": {},
118-
"loadbalance": {},
119-
"hosts": plugins["hosts"]["v1"],
120-
"rewrite": plugins["rewrite"]["v2"],
121-
"transfer": plugins["transfer"]["v1"],
122-
},
60+
plugins: plugins_1_8_3,
12361
},
12462
"1.8.5": {
12563
nextVersion: "1.8.6",
12664
priorVersion: "1.8.4",
12765
dockerImageSHA: "43a9f52f5dce39bf1816afe6141724cc2d08811e466dd46e6628c925e2419bdc",
128-
plugins: map[string]plugin{
129-
"errors": plugins["errors"]["v2"],
130-
"log": plugins["log"]["v1"],
131-
"health": plugins["health"]["v1"],
132-
"ready": {},
133-
"autopath": {},
134-
"kubernetes": plugins["kubernetes"]["v8"],
135-
"k8s_external": plugins["k8s_external"]["v1"],
136-
"prometheus": {},
137-
"forward": plugins["forward"]["v3"],
138-
"cache": plugins["cache"]["v1"],
139-
"loop": {},
140-
"reload": {},
141-
"loadbalance": {},
142-
"hosts": plugins["hosts"]["v1"],
143-
"rewrite": plugins["rewrite"]["v2"],
144-
"transfer": plugins["transfer"]["v1"],
145-
},
66+
plugins: plugins_1_8_3,
14667
},
14768
"1.8.4": {
14869
nextVersion: "1.8.5",
14970
priorVersion: "1.8.3",
15071
dockerImageSHA: "6e5a02c21641597998b4be7cb5eb1e7b02c0d8d23cce4dd09f4682d463798890",
151-
plugins: map[string]plugin{
152-
"errors": plugins["errors"]["v2"],
153-
"log": plugins["log"]["v1"],
154-
"health": plugins["health"]["v1"],
155-
"ready": {},
156-
"autopath": {},
157-
"kubernetes": plugins["kubernetes"]["v8"],
158-
"k8s_external": plugins["k8s_external"]["v1"],
159-
"prometheus": {},
160-
"forward": plugins["forward"]["v3"],
161-
"cache": plugins["cache"]["v1"],
162-
"loop": {},
163-
"reload": {},
164-
"loadbalance": {},
165-
"hosts": plugins["hosts"]["v1"],
166-
"rewrite": plugins["rewrite"]["v2"],
167-
"transfer": plugins["transfer"]["v1"],
168-
},
72+
plugins: plugins_1_8_3,
16973
},
17074
"1.8.3": {
17175
nextVersion: "1.8.4",
17276
priorVersion: "1.8.0", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
17377
dockerImageSHA: "642ff9910da6ea9a8624b0234eef52af9ca75ecbec474c5507cb096bdfbae4e5",
174-
plugins: map[string]plugin{
175-
"errors": plugins["errors"]["v2"],
176-
"log": plugins["log"]["v1"],
177-
"health": plugins["health"]["v1"],
178-
"ready": {},
179-
"autopath": {},
180-
"kubernetes": plugins["kubernetes"]["v8"],
181-
"k8s_external": plugins["k8s_external"]["v1"],
182-
"prometheus": {},
183-
"forward": plugins["forward"]["v3"],
184-
"cache": plugins["cache"]["v1"],
185-
"loop": {},
186-
"reload": {},
187-
"loadbalance": {},
188-
"hosts": plugins["hosts"]["v1"],
189-
"rewrite": plugins["rewrite"]["v2"],
190-
"transfer": plugins["transfer"]["v1"],
191-
},
78+
plugins: plugins_1_8_3,
19279
},
19380
"1.8.0": {
19481
nextVersion: "1.8.3", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
@@ -410,45 +297,13 @@ var Versions = map[string]release{
410297
nextVersion: "1.6.5",
411298
priorVersion: "1.6.3",
412299
dockerImageSHA: "493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b",
413-
plugins: map[string]plugin{
414-
"errors": plugins["errors"]["v2"],
415-
"log": plugins["log"]["v1"],
416-
"health": plugins["health"]["v1"],
417-
"ready": {},
418-
"autopath": {},
419-
"kubernetes": plugins["kubernetes"]["v6"],
420-
"k8s_external": plugins["k8s_external"]["v1"],
421-
"prometheus": {},
422-
"forward": plugins["forward"]["v2"],
423-
"cache": plugins["cache"]["v1"],
424-
"loop": {},
425-
"reload": {},
426-
"loadbalance": {},
427-
"hosts": plugins["hosts"]["v1"],
428-
"rewrite": plugins["rewrite"]["v2"],
429-
},
300+
plugins: plugins_1_6_0,
430301
},
431302
"1.6.3": {
432303
nextVersion: "1.6.4",
433304
priorVersion: "1.6.2",
434305
dockerImageSHA: "cfa7236dab4e3860881fdf755880ff8361e42f6cba2e3775ae48e2d46d22f7ba",
435-
plugins: map[string]plugin{
436-
"errors": plugins["errors"]["v2"],
437-
"log": plugins["log"]["v1"],
438-
"health": plugins["health"]["v1"],
439-
"ready": {},
440-
"autopath": {},
441-
"kubernetes": plugins["kubernetes"]["v6"],
442-
"k8s_external": plugins["k8s_external"]["v1"],
443-
"prometheus": {},
444-
"forward": plugins["forward"]["v2"],
445-
"cache": plugins["cache"]["v1"],
446-
"loop": {},
447-
"reload": {},
448-
"loadbalance": {},
449-
"hosts": plugins["hosts"]["v1"],
450-
"rewrite": plugins["rewrite"]["v2"],
451-
},
306+
plugins: plugins_1_6_0,
452307
},
453308
"1.6.2": {
454309
nextVersion: "1.6.3",
@@ -471,67 +326,19 @@ var Versions = map[string]release{
471326
reload
472327
loadbalance
473328
}`,
474-
plugins: map[string]plugin{
475-
"errors": plugins["errors"]["v2"],
476-
"log": plugins["log"]["v1"],
477-
"health": plugins["health"]["v1"],
478-
"ready": {},
479-
"autopath": {},
480-
"kubernetes": plugins["kubernetes"]["v6"],
481-
"k8s_external": plugins["k8s_external"]["v1"],
482-
"prometheus": {},
483-
"forward": plugins["forward"]["v2"],
484-
"cache": plugins["cache"]["v1"],
485-
"loop": {},
486-
"reload": {},
487-
"loadbalance": {},
488-
"hosts": plugins["hosts"]["v1"],
489-
"rewrite": plugins["rewrite"]["v2"],
490-
},
329+
plugins: plugins_1_6_0,
491330
},
492331
"1.6.1": {
493332
nextVersion: "1.6.2",
494333
priorVersion: "1.6.0",
495334
dockerImageSHA: "9ae3b6fcac4ee821362277de6bd8fd2236fa7d3e19af2ef0406d80b595620a7a",
496-
plugins: map[string]plugin{
497-
"errors": plugins["errors"]["v2"],
498-
"log": plugins["log"]["v1"],
499-
"health": plugins["health"]["v1"],
500-
"ready": {},
501-
"autopath": {},
502-
"kubernetes": plugins["kubernetes"]["v6"],
503-
"k8s_external": plugins["k8s_external"]["v1"],
504-
"prometheus": {},
505-
"forward": plugins["forward"]["v2"],
506-
"cache": plugins["cache"]["v1"],
507-
"loop": {},
508-
"reload": {},
509-
"loadbalance": {},
510-
"hosts": plugins["hosts"]["v1"],
511-
"rewrite": plugins["rewrite"]["v2"],
512-
},
335+
plugins: plugins_1_6_0,
513336
},
514337
"1.6.0": {
515338
nextVersion: "1.6.1",
516339
priorVersion: "1.5.2",
517340
dockerImageSHA: "263d03f2b889a75a0b91e035c2a14d45d7c1559c53444c5f7abf3a76014b779d",
518-
plugins: map[string]plugin{
519-
"errors": plugins["errors"]["v2"],
520-
"log": plugins["log"]["v1"],
521-
"health": plugins["health"]["v1"],
522-
"ready": {},
523-
"autopath": {},
524-
"kubernetes": plugins["kubernetes"]["v6"],
525-
"k8s_external": plugins["k8s_external"]["v1"],
526-
"prometheus": {},
527-
"forward": plugins["forward"]["v2"],
528-
"cache": plugins["cache"]["v1"],
529-
"loop": {},
530-
"reload": {},
531-
"loadbalance": {},
532-
"hosts": plugins["hosts"]["v1"],
533-
"rewrite": plugins["rewrite"]["v2"],
534-
},
341+
plugins: plugins_1_6_0,
535342
},
536343
"1.5.2": {
537344
nextVersion: "1.6.0",
@@ -913,3 +720,40 @@ var Versions = map[string]release{
913720
reload
914721
}`},
915722
}
723+
724+
var plugins_1_8_3 = map[string]plugin{
725+
"errors": plugins["errors"]["v2"],
726+
"log": plugins["log"]["v1"],
727+
"health": plugins["health"]["v1"],
728+
"ready": {},
729+
"autopath": {},
730+
"kubernetes": plugins["kubernetes"]["v8"],
731+
"k8s_external": plugins["k8s_external"]["v1"],
732+
"prometheus": {},
733+
"forward": plugins["forward"]["v3"],
734+
"cache": plugins["cache"]["v1"],
735+
"loop": {},
736+
"reload": {},
737+
"loadbalance": {},
738+
"hosts": plugins["hosts"]["v1"],
739+
"rewrite": plugins["rewrite"]["v2"],
740+
"transfer": plugins["transfer"]["v1"],
741+
}
742+
743+
var plugins_1_6_0 = map[string]plugin{
744+
"errors": plugins["errors"]["v2"],
745+
"log": plugins["log"]["v1"],
746+
"health": plugins["health"]["v1"],
747+
"ready": {},
748+
"autopath": {},
749+
"kubernetes": plugins["kubernetes"]["v6"],
750+
"k8s_external": plugins["k8s_external"]["v1"],
751+
"prometheus": {},
752+
"forward": plugins["forward"]["v2"],
753+
"cache": plugins["cache"]["v1"],
754+
"loop": {},
755+
"reload": {},
756+
"loadbalance": {},
757+
"hosts": plugins["hosts"]["v1"],
758+
"rewrite": plugins["rewrite"]["v2"],
759+
}

0 commit comments

Comments
 (0)