append some annotation and 1.10.1 migration

Signed-off-by: guangli.bao <guangli.bao@daocloud.io>
coredns · Aug 21, 2023 · e1d66d1 · e1d66d1
1 parent 2ec40fe
commit e1d66d1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/migration/plugins.go b/migration/plugins.go
@@ -316,8 +316,8 @@ var plugins = map[string]map[string]plugin{
 				"name":        {},
 				"answer name": {},
 				"edns0":       {},
-				"ttl":         {}, // new option
-				"cname_target": {},
+				"ttl":         {}, 
+				"cname_target": {}, // new option
 			},
 		},
 	},
@@ -346,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": {
@@ -421,7 +430,7 @@ var plugins = map[string]map[string]plugin{
 			namedOptions: map[string]option{
 				"apex": {},
 				"ttl":  {},
-				"Fall": {},
+				"Fall": {}, // new option
 			},
 		},
 	},

diff --git a/migration/versions.go b/migration/versions.go
@@ -39,7 +39,7 @@ var Versions = map[string]release{
 		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",
@@ -761,12 +761,31 @@ var plugins_1_11_0 = map[string]plugin{
 	"k8s_external": plugins["k8s_external"]["v2"], //add fallthrough option
 	"prometheus":   {},
 	"forward":      plugins["forward"]["v3"],
-	"cache":        plugins["cache"]["v1"],
+	"cache":        plugins["cache"]["v2"],
 	"loop":         {},
 	"reload":       {},
 	"loadbalance":  {},
 	"hosts":        plugins["hosts"]["v1"],
-	"rewrite":      plugins["rewrite"]["v3"],
+	"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"],
 	"transfer":     plugins["transfer"]["v1"],
 }