Skip to content

Commit a94b653

Browse files
mboersmamboersma
committed
Bump CAPI to v1.8.0-rc.1
1 parent 2ead02b commit a94b653

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
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.8.0-rc.0/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.1/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.8.0-rc.0",
23+
"capi_version": "v1.8.0-rc.1",
2424
"caaph_version": "v0.2.1",
2525
"cert_manager_version": "v1.15.1",
2626
"kubernetes_version": "v1.28.3",

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ require (
5454
k8s.io/kubectl v0.30.3
5555
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
5656
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
57+
sigs.k8s.io/cluster-api v1.8.0-rc.1
58+
sigs.k8s.io/cluster-api/test v1.8.0-rc.1
5959
sigs.k8s.io/controller-runtime v0.18.4
6060
sigs.k8s.io/kind v0.23.0
6161
)
@@ -220,7 +220,7 @@ require (
220220
sigs.k8s.io/yaml v1.4.0 // indirect
221221
)
222222

223-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.0
223+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.1
224224

225225
replace (
226226
github.com/google/cel-go => github.com/google/cel-go v0.17.8

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vc
160160
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
161161
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
162162
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
163-
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
164-
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
165-
github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE=
166-
github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
163+
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
164+
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
165+
github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw=
166+
github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI=
167167
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
168168
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
169169
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
@@ -726,10 +726,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29 h1:qiifAaaBqV3d/EcN9dKJaJI
726726
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29/go.mod h1:ZFAt0qF1kR+w8nBVJK56s6CFvLrlosN1i2c+Sxb7LBk=
727727
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16 h1:Fm/Yjv4nXjUtJ90uXKSKwPwaTWYuDFMhDNNOd77PlOg=
728728
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16/go.mod h1:+kl90flu4+WCP6HBGVYbKVQR+5ztDzUNrWJz8rsnvRU=
729-
sigs.k8s.io/cluster-api v1.8.0-rc.0 h1:Q103UfK++rI160mtURBjg4ovJ9vxJTIrrdkL7NQBdFQ=
730-
sigs.k8s.io/cluster-api v1.8.0-rc.0/go.mod h1:TNkfly2mrCG8O6DjGFru0USq1NhWbo2njpSXxKrRgL0=
731-
sigs.k8s.io/cluster-api/test v1.8.0-rc.0 h1:JNAxc+8QE4Vk51NFgtex6Yh4KlTJfVOjOH6ybiO3HTI=
732-
sigs.k8s.io/cluster-api/test v1.8.0-rc.0/go.mod h1:dwVWpEtSXNUTYb+rSQ/KNNv4lVadx26teQB9CS+yaXM=
729+
sigs.k8s.io/cluster-api v1.8.0-rc.1 h1:iGdYV8QJedw4Kdsdhrs7GUyljREnwLFp6XDxt2cVlrs=
730+
sigs.k8s.io/cluster-api v1.8.0-rc.1/go.mod h1:K/FLuMsQccN91vUNed62wDTE5/biB0oEgad2e8vq8rY=
731+
sigs.k8s.io/cluster-api/test v1.8.0-rc.1 h1:4b0P5ewVncpqi3gY6TkRvcAZtJ3f4HnW/5pQq5c8Md8=
732+
sigs.k8s.io/cluster-api/test v1.8.0-rc.1/go.mod h1:dwVWpEtSXNUTYb+rSQ/KNNv4lVadx26teQB9CS+yaXM=
733733
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
734734
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
735735
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

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

Lines changed: 10 additions & 10 deletions
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.8.0-rc.0
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.0-rc.1
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.0-rc.0
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.0-rc.1
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.0-rc.0
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.0-rc.1
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.1.1-alpha.1
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.8.0-rc.0
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.0/core-components.yaml
28+
- name: v1.8.0-rc.1
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.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.8.0-rc.0
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.0/bootstrap-components.yaml
51+
- name: v1.8.0-rc.1
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.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.8.0-rc.0
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.0/control-plane-components.yaml
73+
- name: v1.8.0-rc.1
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-rc.1/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -225,7 +225,7 @@ variables:
225225
SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}"
226226
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
227227
OLD_CAPI_UPGRADE_VERSION: "v1.6.7"
228-
LATEST_CAPI_UPGRADE_VERSION: "v1.8.0-rc.0"
228+
LATEST_CAPI_UPGRADE_VERSION: "v1.8.0-rc.1"
229229
OLD_PROVIDER_UPGRADE_VERSION: "v1.15.3"
230230
LATEST_PROVIDER_UPGRADE_VERSION: "v1.16.0"
231231
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)