From c11836956376bff77847bc3f6215c9a1232408ab Mon Sep 17 00:00:00 2001 From: Kun Zhou <156021375+Kun483@users.noreply.github.com> Date: Wed, 24 Apr 2024 08:30:05 -0700 Subject: [PATCH 1/2] PCP-2764: update golang version to 1.22 (#133) --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b80b47b3be45..59358d05ff3e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module sigs.k8s.io/cluster-api -go 1.21 +go 1.22 + +toolchain go1.22.2 require ( github.com/MakeNowJust/heredoc v1.0.0 From db034002be28b9b9fd9d713ea6742b2945568444 Mon Sep 17 00:00:00 2001 From: kun zhou Date: Mon, 20 May 2024 11:29:42 -0700 Subject: [PATCH 2/2] PCP-2916: make coreDNS 1.11.1 be available to use make coreDNS 1.11.1 be available to use --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 59358d05ff3e..9eb635b016dc 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,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.20 + github.com/coredns/corefile-migration v1.0.21 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 index 82dcacd3beef..02d844908975 100644 --- a/go.sum +++ b/go.sum @@ -122,8 +122,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/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.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI= -github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= +github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE= +github.com/coredns/corefile-migration v1.0.21/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=