Skip to content

Commit a850819

Browse files
tamalsahatamalsaha
committed
capi 1.10.2
Signed-off-by: Tamal Saha <[email protected]>
1 parent 2668030 commit a850819

File tree

7 files changed

+37
-37
lines changed

7 files changed

+37
-37
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ require (
5050
k8s.io/kubectl v0.32.3
5151
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
5252
sigs.k8s.io/aws-iam-authenticator v0.6.13
53-
sigs.k8s.io/cluster-api v1.10.1
54-
sigs.k8s.io/cluster-api/test v1.10.1
53+
sigs.k8s.io/cluster-api v1.10.2
54+
sigs.k8s.io/cluster-api/test v1.10.2
5555
sigs.k8s.io/controller-runtime v0.20.4
5656
sigs.k8s.io/yaml v1.4.0
5757
)
@@ -208,7 +208,7 @@ require (
208208
go.uber.org/multierr v1.11.0 // indirect
209209
go.uber.org/zap v1.27.0 // indirect
210210
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
211-
golang.org/x/net v0.37.0 // indirect
211+
golang.org/x/net v0.38.0 // indirect
212212
golang.org/x/oauth2 v0.28.0 // indirect
213213
golang.org/x/sync v0.12.0 // indirect
214214
golang.org/x/sys v0.31.0 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
580580
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
581581
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
582582
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
583-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
584-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
583+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
584+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
585585
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
586586
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
587587
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
@@ -728,10 +728,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcp
728728
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
729729
sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb4e6Rs9gA=
730730
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
731-
sigs.k8s.io/cluster-api v1.10.1 h1:5vsLNgQ4SkPudJ1USK532B0SIdJxRsCNKt2DZtBf+ww=
732-
sigs.k8s.io/cluster-api v1.10.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
733-
sigs.k8s.io/cluster-api/test v1.10.1 h1:cSgbfROhT42+M1YQg6Wj5DQWNjRZtkFQGIDSu6JJjmk=
734-
sigs.k8s.io/cluster-api/test v1.10.1/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
731+
sigs.k8s.io/cluster-api v1.10.2 h1:xfvtNu4Fy/41grL0ryH5xSKQjpJEWdO8HiV2lPCCozQ=
732+
sigs.k8s.io/cluster-api v1.10.2/go.mod h1:/b9Un5Imprib6S7ZOcJitC2ep/5wN72b0pXpMQFfbTw=
733+
sigs.k8s.io/cluster-api/test v1.10.2 h1:y6vSdS9FSAi/DNoFE2fZo2fed0m1cgW+ueBazk1g4i8=
734+
sigs.k8s.io/cluster-api/test v1.10.2/go.mod h1:KLeRjNtQS8k5jIPvQF0QxOti/ATu5euwSusb6iFBga8=
735735
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
736736
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
737737
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎hack/tools/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
k8s.io/code-generator v0.32.3
1818
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9
1919
k8s.io/klog/v2 v2.130.1
20-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8
20+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250520093716-525566440a77
2121
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
2222
sigs.k8s.io/controller-tools v0.17.3
2323
sigs.k8s.io/kind v0.26.0
@@ -415,7 +415,7 @@ require (
415415
golang.org/x/crypto v0.36.0 // indirect
416416
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
417417
golang.org/x/mod v0.23.0 // indirect
418-
golang.org/x/net v0.37.0 // indirect
418+
golang.org/x/net v0.38.0 // indirect
419419
golang.org/x/oauth2 v0.28.0 // indirect
420420
golang.org/x/sync v0.12.0 // indirect
421421
golang.org/x/sys v0.31.0 // indirect
@@ -450,7 +450,7 @@ require (
450450
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
451451
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
452452
lukechampine.com/blake3 v1.2.1 // indirect
453-
sigs.k8s.io/cluster-api v1.10.1 // indirect
453+
sigs.k8s.io/cluster-api v1.10.2 // indirect
454454
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
455455
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
456456
sigs.k8s.io/kustomize/api v0.18.0 // indirect

‎hack/tools/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,8 +1284,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
12841284
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
12851285
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
12861286
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
1287-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
1288-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
1287+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
1288+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
12891289
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
12901290
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
12911291
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
@@ -1507,10 +1507,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
15071507
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
15081508
lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
15091509
lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
1510-
sigs.k8s.io/cluster-api v1.10.1 h1:5vsLNgQ4SkPudJ1USK532B0SIdJxRsCNKt2DZtBf+ww=
1511-
sigs.k8s.io/cluster-api v1.10.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
1512-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8 h1:3TILKTDhWe3LQd6SdP6vebZsKsQsCRuf618jYFvYCjI=
1513-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8/go.mod h1:h/ye+xQHISNgakWvrTQpQ0IIrV8PIkHVw+Q4AaqTrYo=
1510+
sigs.k8s.io/cluster-api v1.10.2 h1:xfvtNu4Fy/41grL0ryH5xSKQjpJEWdO8HiV2lPCCozQ=
1511+
sigs.k8s.io/cluster-api v1.10.2/go.mod h1:/b9Un5Imprib6S7ZOcJitC2ep/5wN72b0pXpMQFfbTw=
1512+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250520093716-525566440a77 h1:k1VO2XTDS8yl8e7FlJimeSxpe4cKD8u5IiNKD3J4enY=
1513+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250520093716-525566440a77/go.mod h1:1G//nbOZnW+4mWs6WWMjEP6f+sFi/KuhtD7JWDuqnjE=
15141514
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c h1:w1vANkdIpYwbEZH0y1C7iJItgdEGvF9A3eCdRmLhg8I=
15151515
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k=
15161516
sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=

‎test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ images:
2626
loadBehavior: tryLoad
2727
- name: quay.io/jetstack/cert-manager-controller:v1.17.2
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.2
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.2
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.2
3434
loadBehavior: tryLoad
3535

3636
providers:
@@ -48,8 +48,8 @@ providers:
4848
new: "imagePullPolicy: IfNotPresent"
4949
- old: --metrics-bind-addr=127.0.0.1:8080
5050
new: --metrics-bind-addr=:8080
51-
- name: v1.10.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/core-components.yaml"
51+
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
5353
type: "url"
5454
contract: v1beta1
5555
files:
@@ -75,8 +75,8 @@ providers:
7575
new: "imagePullPolicy: IfNotPresent"
7676
- old: --metrics-bind-addr=127.0.0.1:8080
7777
new: --metrics-bind-addr=:8080
78-
- name: v1.10.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/bootstrap-components.yaml"
78+
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -102,8 +102,8 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: --metrics-bind-addr=127.0.0.1:8080
104104
new: --metrics-bind-addr=:8080
105-
- name: v1.10.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/control-plane-components.yaml"
105+
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
107107
type: "url"
108108
contract: v1beta1
109109
files:

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.17.2
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.2
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.2
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.2
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.10.1
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/core-components.yaml"
37+
- name: v1.10.2
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.10.1
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/bootstrap-components.yaml"
53+
- name: v1.10.2
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.10.1
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/control-plane-components.yaml"
69+
- name: v1.10.2
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

‎versions.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
CERT_MANAGER_VERSION := v1.17.2
18-
CAPI_VERSION := v1.10.1
18+
CAPI_VERSION := v1.10.2
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2
2121
GOLANGCI_LINT_VERSION := v1.53.3

0 commit comments

Comments
 (0)