Skip to content

Commit c738d12

Browse files
committed
Bump CAPI to v1.8.0-rc.0
1 parent 711d861 commit c738d12

File tree

5 files changed

+99
-88
lines changed

5 files changed

+99
-88
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
312312
./hack/create-custom-cloud-provider-config.sh
313313

314314
# Deploy CAPI
315-
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
315+
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
316316

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

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ settings = {
2020
"deploy_cert_manager": True,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "capz",
23-
"capi_version": "v1.7.4",
23+
"capi_version": "v1.8.0-rc.0",
2424
"caaph_version": "v0.2.1",
2525
"cert_manager_version": "v1.15.1",
2626
"kubernetes_version": "v1.28.3",

go.mod

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,45 @@ require (
4545
golang.org/x/mod v0.20.0
4646
golang.org/x/text v0.16.0
4747
gopkg.in/yaml.v3 v3.0.1
48-
k8s.io/api v0.30.2
49-
k8s.io/apimachinery v0.30.2
50-
k8s.io/client-go v0.30.2
51-
k8s.io/cluster-bootstrap v0.29.3
52-
k8s.io/component-base v0.30.2
48+
k8s.io/api v0.30.3
49+
k8s.io/apimachinery v0.30.3
50+
k8s.io/client-go v0.30.3
51+
k8s.io/cluster-bootstrap v0.30.3
52+
k8s.io/component-base v0.30.3
5353
k8s.io/klog/v2 v2.130.1
54-
k8s.io/kubectl v0.29.3
54+
k8s.io/kubectl v0.30.3
5555
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
56-
sigs.k8s.io/cloud-provider-azure v1.29.3
57-
sigs.k8s.io/cluster-api v1.7.4
58-
sigs.k8s.io/cluster-api/test v1.7.4
56+
sigs.k8s.io/cloud-provider-azure v1.30.4
57+
sigs.k8s.io/cluster-api v1.8.0-rc.0
58+
sigs.k8s.io/cluster-api/test v1.8.0-rc.0
5959
sigs.k8s.io/controller-runtime v0.18.4
6060
sigs.k8s.io/kind v0.23.0
6161
)
6262

6363
require (
64+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 // indirect
65+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
6466
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
6567
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
66-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 // indirect
68+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 // indirect
6769
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
6870
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6971
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7072
github.com/gorilla/websocket v1.5.0 // indirect
73+
github.com/moby/docker-image-spec v1.3.1 // indirect
7174
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
7275
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
73-
k8s.io/apiserver v0.30.2 // indirect
74-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2 // indirect
75-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1 // indirect
76+
k8s.io/apiserver v0.30.3 // indirect
77+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29 // indirect
78+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16 // indirect
7679
)
7780

7881
require (
7982
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
8083
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
8184
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/kubernetesconfiguration/armkubernetesconfiguration v1.1.1
8285
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
83-
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
86+
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
8487
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
8588
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
8689
github.com/Azure/go-autorest/autorest/mocks v0.4.2 // indirect
@@ -97,7 +100,7 @@ require (
97100
github.com/Microsoft/go-winio v0.6.0 // indirect
98101
github.com/NYTimes/gziphandler v1.1.1 // indirect
99102
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
100-
github.com/adrg/xdg v0.4.0 // indirect
103+
github.com/adrg/xdg v0.5.0 // indirect
101104
github.com/alessio/shellescape v1.4.1 // indirect
102105
github.com/benbjohnson/clock v1.3.5 // indirect
103106
github.com/beorn7/perks v1.0.1 // indirect
@@ -107,8 +110,8 @@ require (
107110
github.com/cloudflare/circl v1.3.7 // indirect
108111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
109112
github.com/dimchansky/utfbom v1.1.1 // indirect
110-
github.com/distribution/reference v0.5.0 // indirect
111-
github.com/docker/docker v25.0.6+incompatible // indirect
113+
github.com/distribution/reference v0.6.0 // indirect
114+
github.com/docker/docker v27.1.0+incompatible // indirect
112115
github.com/docker/go-connections v0.5.0 // indirect
113116
github.com/docker/go-units v0.5.0 // indirect
114117
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -165,7 +168,7 @@ require (
165168
github.com/opencontainers/go-digest v1.0.0 // indirect
166169
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
167170
github.com/pelletier/go-toml v1.9.5 // indirect
168-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
171+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
169172
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
170173
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
171174
github.com/prometheus/client_model v0.6.1 // indirect
@@ -178,7 +181,7 @@ require (
178181
github.com/spf13/afero v1.11.0 // indirect
179182
github.com/spf13/cast v1.6.0 // indirect
180183
github.com/spf13/cobra v1.8.1 // indirect
181-
github.com/spf13/viper v1.18.2 // indirect
184+
github.com/spf13/viper v1.19.0 // indirect
182185
github.com/stoewer/go-strcase v1.3.0 // indirect
183186
github.com/subosito/gotenv v1.6.0 // indirect
184187
github.com/valyala/fastjson v1.6.4 // indirect
@@ -204,10 +207,10 @@ require (
204207
gopkg.in/inf.v0 v0.9.1 // indirect
205208
gopkg.in/ini.v1 v1.67.0 // indirect
206209
gopkg.in/yaml.v2 v2.4.0 // indirect
207-
k8s.io/apiextensions-apiserver v0.30.2 // indirect
208-
k8s.io/cli-runtime v0.29.3 // indirect
209-
k8s.io/cloud-provider v0.29.3 // indirect
210-
k8s.io/component-helpers v0.29.3 // indirect
210+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
211+
k8s.io/cli-runtime v0.30.3 // indirect
212+
k8s.io/cloud-provider v0.30.2 // indirect
213+
k8s.io/component-helpers v0.30.3 // indirect
211214
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
212215
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
213216
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -217,7 +220,7 @@ require (
217220
sigs.k8s.io/yaml v1.4.0 // indirect
218221
)
219222

220-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.4
223+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.0
221224

222225
// kube-openapi should match the version imported by CAPI.
223226
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00

0 commit comments

Comments
 (0)