Skip to content

Commit 7de4339

Browse files
peirulupeirulu
authored
update corefile migration to support coredns 1.13.2 (#5247)
* update corefile migration to suppor coredns 1.13.2 * update checksum
1 parent 46539e3 commit 7de4339

File tree

38 files changed

+93
-46
lines changed

38 files changed

+93
-46
lines changed

‎projects/kubernetes-sigs/cluster-api/CHECKSUMS‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
954104c9bc9bbc4731f2da1b44885e48e888d1ddbacb3eb11a44849214a148ab _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
2-
0f525eaa5fdfce035dfe3de8e57ab85bc8594efb3488d1bb77ebaf2cbe35e348 _output/bin/cluster-api/linux-amd64/clusterctl
3-
8cc6cefaf00ec0c6963fdb72c2f5787e055b81b1bce99ca18bdffdb4eb8ee27d _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
4-
213ce08f7fc91393423e7aa35f188a85d178d3bd3a0640413594e7257e491cef _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
5-
69e440437a552d9887b426846bde886a460b5f469defa25663b8c898c42cf592 _output/bin/cluster-api/linux-amd64/manager
6-
bd738b576d056517bf800e7d90a6e5731e64cc98a91fce47767410dcca3fc764 _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
7-
3cef598945214048bbc02d5fcbed7eed45301230bb827d950b88f9723da9c5f2 _output/bin/cluster-api/linux-arm64/clusterctl
8-
24aa8709a60d3e6c34bb4d94e25804305e1eb0f38a2dc4f55ebc8196081c1d6f _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
9-
0bc80436155c0868b45d3380b04d6fcd12bf60412c1c8267d96a5c7a6ebe487d _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
10-
00d6daec661dcf0d7496ce9df476ae416a098e7ede675c448a9ddecd85a5b91c _output/bin/cluster-api/linux-arm64/manager
1+
3e4d4fe14642c76426cfff7b27628964d9fae0621893877dba5e5aa786120d67 _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
2+
b1c7c76c7bf7bfe5cc18112e24239fbbc6b880676316b5d88789f78684e902ee _output/bin/cluster-api/linux-amd64/clusterctl
3+
a7371ad47f351339e5acbac3112019f2670e4057bdf71040814d3a6bea793a4d _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
4+
cc9eaaab54404d6ca9f6d228a7a13952215b096ec5f53199d326cb15685bed49 _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
5+
482d7109ab26d1856453debdf315275bbe0c20d7bea2bf0bbb1356a7626625de _output/bin/cluster-api/linux-amd64/manager
6+
c2226de11cd8f1e42763bc49526a95d5f4eca443a3b5a4bec8846577e14938df _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
7+
227d3545f1e0f90b29fe3b103115ebb9a803089fcc4bd88985cca03bde76d313 _output/bin/cluster-api/linux-arm64/clusterctl
8+
f8ab9f6b94d780678adfb4f9878589641839e4078e7a645f217a1dbebb3d912d _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
9+
e76f365d8d98dad141506719ca2770b5778b895aac20c2966e6def2b893d84d3 _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
10+
5b757a0a5f1f27133690b9d3ea0f2a3b27b4f2c5ac47237e1c3ed54b3d53c7fc _output/bin/cluster-api/linux-arm64/manager

‎projects/kubernetes-sigs/cluster-api/patches/0001-Support-core-dns-1.13.2-for-eks-1-33-25.patch‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 89330ec1e614331e9f6c9f8a7a9bcc9ae7efdbc3 Mon Sep 17 00:00:00 2001
2+
From: Amelia Lu <63176721+peirulu@users.noreply.github.com>
3+
Date: Tue, 17 Mar 2026 15:38:55 -0700
4+
Subject: [PATCH 01/37] support core dns 1.13.2 for eks-1-33-25
5+
6+
7+
EKS-D 1.33-25 ships with coredns 1.13.2. The corefile-migration package
8+
with release version 1.0.31 supports 1.11.3. Temporarily ovewriting the version
9+
to point to the latest release 1.0.31. The patch can be removed once the package has been
10+
bumped in upstream capi.
11+
12+
---
13+
go.mod | 2 +-
14+
go.sum | 4 ++--
15+
2 files changed, 3 insertions(+), 3 deletions(-)
16+
17+
diff --git a/go.mod b/go.mod
18+
index 61eb8f44f..2b708f9ae 100644
19+
--- a/go.mod
20+
+++ b/go.mod
21+
@@ -7,7 +7,7 @@ require (
22+
github.com/Masterminds/sprig/v3 v3.3.0
23+
github.com/adrg/xdg v0.5.3
24+
github.com/blang/semver/v4 v4.0.0
25+
- github.com/coredns/corefile-migration v1.0.29
26+
+ github.com/coredns/corefile-migration v1.0.31
27+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
28+
github.com/distribution/reference v0.6.0
29+
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
30+
diff --git a/go.sum b/go.sum
31+
index b40f4a16d..2d1a640fe 100644
32+
--- a/go.sum
33+
+++ b/go.sum
34+
@@ -65,8 +65,8 @@ github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ
35+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
36+
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
37+
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
38+
-github.com/coredns/corefile-migration v1.0.29 h1:g4cPYMXXDDs9uLE2gFYrJaPBuUAR07eEMGyh9JBE13w=
39+
-github.com/coredns/corefile-migration v1.0.29/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
40+
+github.com/coredns/corefile-migration v1.0.31 h1:f7WGhY8M2Jn8P2dVO0p7wSQ1QKsMARl6WEyUjCb/V38=
41+
+github.com/coredns/corefile-migration v1.0.31/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
42+
github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
43+
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
44+
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
45+
--
46+
2.48.1
47+

projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0002-Adding-capi-support-for-Bottlerocket.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From e662675c5e9b92492fd92c456aa0a637a621f2ed Mon Sep 17 00:00:00 2001
22
From: Vignesh Goutham Ganesh <vgg@amazon.com>
33
Date: Fri, 11 Jun 2021 10:43:09 -0700
4-
Subject: [PATCH 01/36] Adding capi support for Bottlerocket
4+
Subject: [PATCH 02/37] Adding capi support for Bottlerocket
55

66
Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
77

projects/kubernetes-sigs/cluster-api/patches/0002-Add-unstacked-etcd-support.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0003-Add-unstacked-etcd-support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 1780cfc7760add9bbbb674b8f33a32f1ed67bdf1 Mon Sep 17 00:00:00 2001
22
From: Rajashree Mandaogane <mandaor@amazon.com>
33
Date: Mon, 28 Jun 2021 13:44:50 -0700
4-
Subject: [PATCH 02/36] Add unstacked etcd support
4+
Subject: [PATCH 03/37] Add unstacked etcd support
55

66
Unstacked etcd: API and config changes
77

projects/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0004-Unstacked-etcd-and-controlplane-upgrade.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From d2e210e242a661f714f9f614bc17c4d15f29f251 Mon Sep 17 00:00:00 2001
22
From: Rajashree Mandaogane <mandaor@amazon.com>
33
Date: Fri, 6 Aug 2021 17:16:39 -0700
4-
Subject: [PATCH 03/36] Unstacked etcd and controlplane upgrade
4+
Subject: [PATCH 04/37] Unstacked etcd and controlplane upgrade
55

66
Rename controlplane upgrade annotation variable
77

projects/kubernetes-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0005-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From e69029ee1662158db0c10595d417ce7b72e40ad6 Mon Sep 17 00:00:00 2001
22
From: Guillermo Gaston <gaslor@amazon.com>
33
Date: Thu, 19 Aug 2021 21:52:52 +0000
4-
Subject: [PATCH 04/36] Patch config path in kubevip manifest for kubeadm
4+
Subject: [PATCH 05/37] Patch config path in kubevip manifest for kubeadm
55
control plane join with bottlerocket format
66

77
cr: https://code.amazon.com/reviews/CR-55711271

projects/kubernetes-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0006-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From fa300ba98d0415223af9119cc8f4e9907fbb15a4 Mon Sep 17 00:00:00 2001
22
From: Guillermo Gaston <gaslor@amazon.com>
33
Date: Tue, 31 Aug 2021 15:56:28 +0000
4-
Subject: [PATCH 05/36] Make pause and bottlerocket bootstrap images updatable
4+
Subject: [PATCH 06/37] Make pause and bottlerocket bootstrap images updatable
55
in validation webhook
66

77
cr: https://code.amazon.com/reviews/CR-56335855

projects/kubernetes-sigs/cluster-api/patches/0006-Fix-proxy-template-for-bottlerocket-bootstrap.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 79847e4399066411ee688c387a277b6c24cdd218 Mon Sep 17 00:00:00 2001
22
From: Rajashree Mandaogane <mandaor@amazon.com>
33
Date: Thu, 30 Sep 2021 14:04:36 -0700
4-
Subject: [PATCH 06/36] Fix proxy template for bottlerocket bootstrap
4+
Subject: [PATCH 07/37] Fix proxy template for bottlerocket bootstrap
55

66
Bottlerocket expects no-proxy setting to be a comma-separated list
77
of strings. The proxy template was parsing the input no-proxy list

projects/kubernetes-sigs/cluster-api/patches/0007-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0008-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 2e6f9a956c1e41ed0a12b0e665b70c6dbe965036 Mon Sep 17 00:00:00 2001
22
From: Rajashree Mandaogane <mandaor@amazon.com>
33
Date: Sun, 21 Nov 2021 20:59:58 -0800
4-
Subject: [PATCH 07/36] Add bottlerocket changes to capbk v1alpha4 api
4+
Subject: [PATCH 08/37] Add bottlerocket changes to capbk v1alpha4 api
55

66
---
77
.../types/upstreamv1beta3/conversion.go | 24 +++

projects/kubernetes-sigs/cluster-api/patches/0008-Add-status.version-to-list-of-fields-to-ignore-for-u.patch renamed to projects/kubernetes-sigs/cluster-api/patches/0009-Add-status.version-to-list-of-fields-to-ignore-for-u.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 104a850fe73b32bce53ae20cf77893ec6681ee64 Mon Sep 17 00:00:00 2001
22
From: Vivek Koppuru <koppv@amazon.com>
33
Date: Wed, 12 Jan 2022 19:04:15 -0800
4-
Subject: [PATCH 08/36] Add status.version to list of fields to ignore for
4+
Subject: [PATCH 09/37] Add status.version to list of fields to ignore for
55
update
66

77
---

0 commit comments

Comments
 (0)