support coredns v1.11.0 #76

tukwila · 2023-08-09T10:27:28Z

Now coredns release new version: https://github.com/coredns/coredns/releases/tag/v1.11.0, so do upgrade in corefile-migration.

docker.io/coredns/coredns:1.11.0:                                                 resolved       |++++++++++++++++++++++++++++++++++++++| 
index-sha256:cc3ebb05fbdba439d2d69813f162aa204b027098c8244fb3156e6e7c0f31c548:    done           |++++++++++++++++++++++++++++++++++++++| 
manifest-sha256:28cccdd25b4d971951d50fd6e08ab5fe9a894d04db03557f2713bdf0347e7ddc: done           |++++++++++++++++++++++++++++++++++++++| 
config-sha256:321c7cb4ac8b4bc06b4e71e1b2526972245292a8502dce49d98843a271b3ba20:   done           |++++++++++++++++++++++++++++++++++++++| 
layer-sha256:caa886227134d11f25a4cf824034a597eb7ec611bccdfc2785f7f342ed3e2c27:    done           |++++++++++++++++++++++++++++++++++++++| 
layer-sha256:b28ed2365b9cb98936f0420af9de5343264762eb3e20fed4989e22149176664d:    done           |++++++++++++++++++++++++++++++++++++++| 
elapsed: 22.6s                                                                    total:  122.5  (5.4 KiB/s)

And some plugin changes please review if it is right in versions.go?
@chrisohaver @miekg

tukwila · 2023-08-11T01:00:52Z

@chrisohaver Could you please review this PR?

chrisohaver

The plugins map is not correct. It adds plugins that are not supported by the migration, and is missing plugins that it does support. If any new options have been added to supported plugins, those will need to be added.

tukwila · 2023-08-13T14:23:25Z

The plugins map is not correct. It adds plugins that are not supported by the migration, and is missing plugins that it does support. If any new options have been added to supported plugins, those will need to be added.

Do you mean i need not to add any plugins currently? so i modify plugin definition like this,

Am i right?

chrisohaver · 2023-08-13T14:35:21Z

I don’t know how to interpret your marked up screen shot. Please take a look at some of the prior PRs in this repo that have added a support for a new coredns version to see how they are done.

Please look at the release notes for the list of plugins the migration package supports. I would not recommend adding to that list at this time.

tukwila · 2023-08-14T13:04:19Z

I don’t know how to interpret your marked up screen shot. Please take a look at some of the prior PRs in this repo that have added a support for a new coredns version to see how they are done.

Please look at the release notes for the list of plugins the migration package supports. I would not recommend adding to that list at this time.

Yes, i read prior plugins and coredns release-notes, then append plugins_1_11_0 cause's in v1.11.0 release-notes there are two new function added into plugins:
plugin/dnstap: add tls support (coredns/coredns#5917)
plugin/k8s_external: add fallthrough option (coredns/coredns#5959)

so, please review my code again. Big thanks.

migration/versions.go

chrisohaver

Thanks! Looks good! Just some minor changes requested on comments.

chrisohaver · 2023-08-17T23:27:44Z

migration/plugins.go

+				"answer name": {},
+				"edns0":       {},
+				"ttl":         {}, // new option
+				"cname_target": {},


Suggested change

"cname_target": {},

"cname_target": {}, // new option

chrisohaver · 2023-08-18T13:20:20Z

migration/plugins.go

+			namedOptions: map[string]option{
+				"apex": {},
+				"ttl":  {},
+				"Fall": {},


Suggested change

"Fall": {},

"fallthrough": {}, // new option

chrisohaver · 2023-08-18T13:22:52Z

migration/plugins.go

+				"name":        {},
+				"answer name": {},
+				"edns0":       {},
+				"ttl":         {}, // new option


Suggested change

"ttl": {}, // new option

"ttl": {},

chrisohaver · 2023-08-18T13:27:26Z

migration/versions.go

+	"reload":       {},
+	"loadbalance":  {},
+	"hosts":        plugins["hosts"]["v1"],
+	"rewrite":      plugins["rewrite"]["v3"],


Suggested change

"rewrite": plugins["rewrite"]["v3"],

"rewrite": plugins["rewrite"]["v3"], // add cname_target option

chrisohaver

~~There was also a new option added to the cache plugin: keepttl coredns/coredns#5879~~

Nevermind - that was added in 1.10.1 ...

... Although it looks like it's missing from the 1.10.1 migration. Eventually that should be fixed, but OK if you don't want to do it in this PR.

tukwila · 2023-08-21T01:04:23Z

~~There was also a new option added to the cache plugin: keepttl coredns/coredns#5879~~

Nevermind - that was added in 1.10.1 ...

... Although it looks like it's missing from the 1.10.1 migration. Eventually that should be fixed, but OK if you don't want to do it in this PR.

yes，i review coredns v1.10.1 releasenotes and append cache plugin new added option keepttl. Please review it. -:)

tukwila · 2023-08-22T00:44:55Z

@chrisohaver Could you review my commit again? i hope my commit is within your expected. :)

chrisohaver

Looks good! Thanks! Just one fix required to the name of the new fallthrough option in k8s_external.

chrisohaver · 2023-08-22T12:03:03Z

migration/plugins.go

+			namedOptions: map[string]option{
+				"apex": {},
+				"ttl":  {},
+				"Fall": {}, // new option


Suggested change

"Fall": {}, // new option

"fallthtrough": {}, // new option

chrisohaver · 2023-08-22T12:06:18Z

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.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, v1.11.0


Suggested change

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, v1.11.0

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

chrisohaver

... and also fix to version string in valid versions test.

correct plugins modify plugins definitions append some annotation and 1.10.1 migration update based on review comments Signed-off-by: guangli.bao <guangli.bao@daocloud.io>

tukwila · 2023-08-22T13:57:59Z

... and also fix to version string in valid versions test.

@chrisohaver yes, it's my fault and I corrected. I hope you are online now then review it again. Cross my finger to pray that it can be ok this time.

chrisohaver requested changes Aug 11, 2023

View reviewed changes

tukwila force-pushed the support_coredns_v1.11.0 branch from 14b4a0b to ccb1474 Compare August 14, 2023 13:00

chrisohaver requested changes Aug 14, 2023

View reviewed changes

migration/versions.go Outdated Show resolved Hide resolved

migration/versions.go Show resolved Hide resolved

migration/versions.go Show resolved Hide resolved

tukwila requested a review from chrisohaver August 17, 2023 22:30

chrisohaver requested changes Aug 18, 2023

View reviewed changes

tukwila force-pushed the support_coredns_v1.11.0 branch from e1d66d1 to 7a3a352 Compare August 21, 2023 01:02

tukwila requested a review from chrisohaver August 21, 2023 01:02

chrisohaver requested changes Aug 22, 2023

View reviewed changes

chrisohaver reviewed Aug 22, 2023

View reviewed changes

chrisohaver requested changes Aug 22, 2023

View reviewed changes

support coredns v1.11.0

82c96aa

correct plugins modify plugins definitions append some annotation and 1.10.1 migration update based on review comments Signed-off-by: guangli.bao <guangli.bao@daocloud.io>

tukwila force-pushed the support_coredns_v1.11.0 branch from e4daeb2 to 82c96aa Compare August 22, 2023 13:52

chrisohaver approved these changes Aug 22, 2023

View reviewed changes

chrisohaver merged commit 90369fb into coredns:master Aug 22, 2023
3 checks passed

tukwila mentioned this pull request Aug 23, 2023

update coredns to v1.11.1 kubernetes/kubernetes#120116

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support coredns v1.11.0 #76

support coredns v1.11.0 #76

tukwila commented Aug 9, 2023 •

edited

Loading

tukwila commented Aug 11, 2023

chrisohaver left a comment

tukwila commented Aug 13, 2023

chrisohaver commented Aug 13, 2023

tukwila commented Aug 14, 2023

chrisohaver left a comment

chrisohaver Aug 17, 2023

chrisohaver Aug 18, 2023

chrisohaver Aug 18, 2023

chrisohaver Aug 18, 2023

chrisohaver left a comment •

edited

Loading

tukwila commented Aug 21, 2023

tukwila commented Aug 22, 2023

chrisohaver left a comment

chrisohaver Aug 22, 2023

chrisohaver Aug 22, 2023

chrisohaver left a comment

tukwila commented Aug 22, 2023

	"rewrite": plugins["rewrite"]["v3"],
	"rewrite": plugins["rewrite"]["v3"], // add cname_target option

	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, v1.11.0
	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

support coredns v1.11.0 #76

support coredns v1.11.0 #76

Conversation

tukwila commented Aug 9, 2023 • edited Loading

tukwila commented Aug 11, 2023

chrisohaver left a comment

Choose a reason for hiding this comment

tukwila commented Aug 13, 2023

chrisohaver commented Aug 13, 2023

tukwila commented Aug 14, 2023

chrisohaver left a comment

Choose a reason for hiding this comment

chrisohaver Aug 17, 2023

Choose a reason for hiding this comment

chrisohaver Aug 18, 2023

Choose a reason for hiding this comment

chrisohaver Aug 18, 2023

Choose a reason for hiding this comment

chrisohaver Aug 18, 2023

Choose a reason for hiding this comment

chrisohaver left a comment • edited Loading

Choose a reason for hiding this comment

tukwila commented Aug 21, 2023

tukwila commented Aug 22, 2023

chrisohaver left a comment

Choose a reason for hiding this comment

chrisohaver Aug 22, 2023

Choose a reason for hiding this comment

chrisohaver Aug 22, 2023

Choose a reason for hiding this comment

chrisohaver left a comment

Choose a reason for hiding this comment

tukwila commented Aug 22, 2023

tukwila commented Aug 9, 2023 •

edited

Loading

chrisohaver left a comment •

edited

Loading