Skip to content

Commit 964a4d7

Browse files
mboersmamboersma
committed
Bump CAPI to v1.10.0-beta.1
1 parent 8873d97 commit 964a4d7

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
328328
./hack/create-custom-cloud-provider-config.sh
329329

330330
# Deploy CAPI
331-
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
331+
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.1/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
332332

333333
# Deploy CAAPH
334334
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.2.5/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

‎Tiltfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ settings = {
2222
"deploy_cert_manager": True,
2323
"preload_images_for_kind": True,
2424
"kind_cluster_name": "capz",
25-
"capi_version": "v1.10.0-beta.0",
25+
"capi_version": "v1.10.0-beta.1",
2626
"caaph_version": "v0.2.5",
2727
"cert_manager_version": "v1.16.2",
2828
"kubernetes_version": "v1.30.2",

‎docs/book/src/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
120120
Create a `values.yaml` file for the CAPI Operator Helm chart like so:
121121

122122
```yaml
123-
core: "cluster-api:v1.10.0-beta.0"
123+
core: "cluster-api:v1.10.0-beta.1"
124124
infrastructure: "azure:v1.17.2"
125125
addon: "helm:v0.2.5"
126126
manager:

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ require (
2929
github.com/google/uuid v1.6.0
3030
github.com/hashicorp/go-retryablehttp v0.7.7
3131
github.com/hashicorp/golang-lru v1.0.2
32-
github.com/onsi/ginkgo/v2 v2.23.0
33-
github.com/onsi/gomega v1.36.2
32+
github.com/onsi/ginkgo/v2 v2.23.3
33+
github.com/onsi/gomega v1.36.3
3434
github.com/pkg/errors v0.9.1
3535
github.com/pkg/sftp v1.13.7
3636
github.com/prometheus/client_golang v1.21.1
@@ -56,9 +56,9 @@ require (
5656
k8s.io/kubectl v0.30.3
5757
k8s.io/utils v0.0.0-20241210054802-24370beab758
5858
sigs.k8s.io/cloud-provider-azure v1.32.3
59-
sigs.k8s.io/cluster-api v1.10.0-beta.0
60-
sigs.k8s.io/cluster-api/test v1.10.0-beta.0
61-
sigs.k8s.io/controller-runtime v0.20.3
59+
sigs.k8s.io/cluster-api v1.10.0-beta.1
60+
sigs.k8s.io/cluster-api/test v1.10.0-beta.1
61+
sigs.k8s.io/controller-runtime v0.20.4
6262
sigs.k8s.io/kind v0.27.0
6363
)
6464

@@ -129,7 +129,7 @@ require (
129129
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
130130
github.com/dimchansky/utfbom v1.1.1 // indirect
131131
github.com/distribution/reference v0.6.0 // indirect
132-
github.com/docker/docker v28.0.1+incompatible // indirect
132+
github.com/docker/docker v28.0.2+incompatible // indirect
133133
github.com/docker/go-connections v0.5.0 // indirect
134134
github.com/docker/go-units v0.5.0 // indirect
135135
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
203203
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
204204
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
205205
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
206-
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
207-
github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
206+
github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWWWyZVqlDMttE8=
207+
github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
208208
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
209209
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
210210
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -411,10 +411,10 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
411411
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
412412
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
413413
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
414-
github.com/onsi/ginkgo/v2 v2.23.0 h1:FA1xjp8ieYDzlgS5ABTpdUDB7wtngggONc8a7ku2NqQ=
415-
github.com/onsi/ginkgo/v2 v2.23.0/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
416-
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
417-
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
414+
github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
415+
github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
416+
github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
417+
github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
418418
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
419419
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
420420
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
@@ -508,14 +508,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
508508
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
509509
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
510510
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
511-
go.etcd.io/etcd/api/v3 v3.5.19 h1:w3L6sQZGsWPuBxRQ4m6pPP3bVUtV8rjW033EGwlr0jw=
512-
go.etcd.io/etcd/api/v3 v3.5.19/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U=
513-
go.etcd.io/etcd/client/pkg/v3 v3.5.19 h1:9VsyGhg0WQGjDWWlDI4VuaS9PZJGNbPkaHEIuLwtixk=
514-
go.etcd.io/etcd/client/pkg/v3 v3.5.19/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0=
511+
go.etcd.io/etcd/api/v3 v3.5.20 h1:aKfz3nPZECWoZJXMSH9y6h2adXjtOHaHTGEVCuCmaz0=
512+
go.etcd.io/etcd/api/v3 v3.5.20/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U=
513+
go.etcd.io/etcd/client/pkg/v3 v3.5.20 h1:sZIAtra+xCo56gdf6BR62to/hiie5Bwl7hQIqMzVTEM=
514+
go.etcd.io/etcd/client/pkg/v3 v3.5.20/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0=
515515
go.etcd.io/etcd/client/v2 v2.305.16 h1:kQrn9o5czVNaukf2A2At43cE9ZtWauOtf9vRZuiKXow=
516516
go.etcd.io/etcd/client/v2 v2.305.16/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE=
517-
go.etcd.io/etcd/client/v3 v3.5.19 h1:+4byIz6ti3QC28W0zB0cEZWwhpVHXdrKovyycJh1KNo=
518-
go.etcd.io/etcd/client/v3 v3.5.19/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU=
517+
go.etcd.io/etcd/client/v3 v3.5.20 h1:jMT2MwQEhyvhQg49Cec+1ZHJzfUf6ZgcmV0GjPv0tIQ=
518+
go.etcd.io/etcd/client/v3 v3.5.20/go.mod h1:J5lbzYRMUR20YolS5UjlqqMcu3/wdEvG5VNBhzyo3m0=
519519
go.etcd.io/etcd/pkg/v3 v3.5.16 h1:cnavs5WSPWeK4TYwPYfmcr3Joz9BH+TZ6qoUtz6/+mc=
520520
go.etcd.io/etcd/pkg/v3 v3.5.16/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY=
521521
go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk=
@@ -746,12 +746,12 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9 h1:+ngbNuuzAIy4mIA09/ALZxx0
746746
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9/go.mod h1:wlb5KMXferSuS9asjIlqjU7yHnCUEtAGnwjYdDtqdmk=
747747
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI=
748748
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM=
749-
sigs.k8s.io/cluster-api v1.10.0-beta.0 h1:LAMwSqfHsNHMmBzXfaZ2GCXsl+HHeDF4mWFuLmFbftU=
750-
sigs.k8s.io/cluster-api v1.10.0-beta.0/go.mod h1:ZTghHCPfdpVC1aAAPKd/6GfQRmbJ3WvbJtHFMkOq0ho=
751-
sigs.k8s.io/cluster-api/test v1.10.0-beta.0 h1:vPXpPc0YHmPZ3+r7XO4Rn2MLiX0er1dqHClmV+6YwBQ=
752-
sigs.k8s.io/cluster-api/test v1.10.0-beta.0/go.mod h1:EUwHeqQ2jUF+ccC2+nyie7JsP0XMX9KyGzbRhM+h5EU=
753-
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
754-
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
749+
sigs.k8s.io/cluster-api v1.10.0-beta.1 h1:5JUMDtzjFFwx/8hRsse4DMovSmLHkO/qg1WLWZYSBvo=
750+
sigs.k8s.io/cluster-api v1.10.0-beta.1/go.mod h1:fvW9PBx+Qyd3YCL3EvvWsjDbgoOOTinf+denqEmQFkM=
751+
sigs.k8s.io/cluster-api/test v1.10.0-beta.1 h1:EcKJVREvgINlHYWWncA0Nm9qMG+DWwAmhWvcwNrpjQs=
752+
sigs.k8s.io/cluster-api/test v1.10.0-beta.1/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
753+
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
754+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
755755
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
756756
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
757757
sigs.k8s.io/kind v0.27.0 h1:PQ3f0iAWNIj66LYkZ1ivhEg/+Zb6UPMbO+qVei/INZA=

‎test/e2e/config/azure-dev.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.0-beta.0
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.0-beta.1
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.0-beta.0
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.0-beta.1
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.0-beta.0
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.0-beta.1
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.2.5
1313
loadBehavior: tryLoad
@@ -25,8 +25,8 @@ providers:
2525
new: --metrics-addr=:8080
2626
files:
2727
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
28-
- name: v1.10.0-beta.0
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.0/core-components.yaml
28+
- name: v1.10.0-beta.1
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.1/core-components.yaml
3030
type: url
3131
contract: v1beta1
3232
files:
@@ -48,8 +48,8 @@ providers:
4848
new: --metrics-addr=:8080
4949
files:
5050
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
51-
- name: v1.10.0-beta.0
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.0/bootstrap-components.yaml
51+
- name: v1.10.0-beta.1
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.1/bootstrap-components.yaml
5353
type: url
5454
contract: v1beta1
5555
files:
@@ -70,8 +70,8 @@ providers:
7070
new: --metrics-addr=:8080
7171
files:
7272
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
73-
- name: v1.10.0-beta.0
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.0/control-plane-components.yaml
73+
- name: v1.10.0-beta.1
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.0-beta.1/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -235,7 +235,7 @@ variables:
235235
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
236236
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
237237
OLD_CAPI_UPGRADE_VERSION: "v1.8.10"
238-
LATEST_CAPI_UPGRADE_VERSION: "v1.10.0-beta.0"
238+
LATEST_CAPI_UPGRADE_VERSION: "v1.10.0-beta.1"
239239
OLD_PROVIDER_UPGRADE_VERSION: "v1.18.2"
240240
LATEST_PROVIDER_UPGRADE_VERSION: "v1.19.1"
241241
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)