Merge pull request #8078 from killianmuldoon/pr-release-1-3-coredns-m…

…igration [release-1.3] 🌱 Update coredns corefile migration to v1.0.19
kubernetes-sigs · Feb 8, 2023 · c8515b4 · c8515b4
2 parents 0d27929 + d4cab81
commit c8515b4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md
@@ -127,14 +127,17 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
 
 ##### CoreDNS
 
-| CAPI Version    | Max CoreDNS Version for Upgrade |
-|-----------------|---------------------------------|
-| v0.3 (v1alpha3) | v1.8.4                          |
-| v0.4 (v1alpha4) | v1.8.4                          |
-| v1.0 (v1beta1)  | v1.8.5                          |
-| v1.1 (v1beta1)  | v1.9.3                          |
-| v1.2 (v1beta1)  | v1.9.3 (v1.10.0 with >= v1.2.7) |
-| v1.3 (v1beta1)  | v1.10.0                         |
+| CAPI Version         | Max CoreDNS Version for Upgrade |
+|----------------------|---------------------------------|
+| v0.3 (v1alpha3)      | v1.8.4                          |
+| v0.4 (v1alpha4)      | v1.8.4                          |
+| v1.0 (v1beta1)       | v1.8.5                          |
+| v1.1 (v1beta1)       | v1.9.3                          |
+| v1.2 (v1beta1)       | v1.9.3                          |
+| >= v1.2.7 (v1beta1)  | v1.10.0                         |
+| >= v1.2.11 (v1beta1) | v1.10.1                         |
+| v1.3 (v1beta1)       | v1.10.0                         |
+| >= v1.3.4 (v1beta1)  | v1.10.1                         |
 
 #### Kubernetes version specific notes
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/coredns/corefile-migration v1.0.18
+	github.com/coredns/corefile-migration v1.0.19
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/distribution v2.8.1+incompatible
 	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46

diff --git a/go.sum b/go.sum
@@ -143,8 +143,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
 github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
-github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
-github.com/coredns/corefile-migration v1.0.18/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
+github.com/coredns/corefile-migration v1.0.19 h1:SrHdrObdIQptwyBSlcnSY0DbhWrHwJz2Vls6c6Rw2Xk=
+github.com/coredns/corefile-migration v1.0.19/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=

diff --git a/hack/tools/go.sum b/hack/tools/go.sum
@@ -123,7 +123,7 @@ github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBd
 github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
 github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
 github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
-github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
+github.com/coredns/corefile-migration v1.0.19 h1:SrHdrObdIQptwyBSlcnSY0DbhWrHwJz2Vls6c6Rw2Xk=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

diff --git a/test/go.mod b/test/go.mod
@@ -43,7 +43,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coredns/caddy v1.1.0 // indirect
-	github.com/coredns/corefile-migration v1.0.18 // indirect
+	github.com/coredns/corefile-migration v1.0.19 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

diff --git a/test/go.sum b/test/go.sum
@@ -125,8 +125,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
 github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
-github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
-github.com/coredns/corefile-migration v1.0.18/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
+github.com/coredns/corefile-migration v1.0.19 h1:SrHdrObdIQptwyBSlcnSY0DbhWrHwJz2Vls6c6Rw2Xk=
+github.com/coredns/corefile-migration v1.0.19/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=