Skip to content

Commit 07a3ef6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5185 from mboersma/capi-one-seven-seven
[release-1.16] Bump CAPI to v1.7.7
2 parents d7a40dd + 57456e8 commit 07a3ef6

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
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.5/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.7.7/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ settings = {
2020
"deploy_cert_manager": True,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "capz",
23-
"capi_version": "v1.7.6",
23+
"capi_version": "v1.7.7",
2424
"caaph_version": "v0.2.1",
25-
"cert_manager_version": "v1.15.3",
25+
"cert_manager_version": "v1.16.0",
2626
"kubernetes_version": "v1.28.3",
2727
"aks_kubernetes_version": "v1.28.3",
2828
"flatcar_version": "3374.2.1",

‎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.29.3
5555
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
5656
sigs.k8s.io/cloud-provider-azure v1.29.3
57-
sigs.k8s.io/cluster-api v1.7.5
58-
sigs.k8s.io/cluster-api/test v1.7.5
57+
sigs.k8s.io/cluster-api v1.7.7
58+
sigs.k8s.io/cluster-api/test v1.7.7
5959
sigs.k8s.io/controller-runtime v0.18.4
6060
sigs.k8s.io/kind v0.23.0
6161
)
@@ -217,7 +217,7 @@ require (
217217
sigs.k8s.io/yaml v1.4.0 // indirect
218218
)
219219

220-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.5
220+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.7
221221

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

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,10 +718,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2 h1:9Zp+uWnxdUOoy/FaQK1DjPfL
718718
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2/go.mod h1:JKWYkoOyET3wsN0Kk9WxA+zpopkuCy+v4+mrnJ60Yyk=
719719
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1 h1:Lp0nALZmvMJoiVeVV6XjnZv1uClfArnThhuDAjaqE5A=
720720
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1/go.mod h1:pPkJPx/eMVWP3R+LhPoOYGoY7lywcMJev5L2uSfH+Jo=
721-
sigs.k8s.io/cluster-api v1.7.5 h1:FNg2av2yX4eegJzoZAqV7VfhCKdbyl/I+8tuyhA8xLc=
722-
sigs.k8s.io/cluster-api v1.7.5/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
723-
sigs.k8s.io/cluster-api/test v1.7.5 h1:aCDN/o2MMO3ZRkJb5F3K9QLH/dnI6AgUtKcG4F3bKes=
724-
sigs.k8s.io/cluster-api/test v1.7.5/go.mod h1:duCbyppQEogtpqA8PupIRX1O2b7qh6xrwrpFTexr1DY=
721+
sigs.k8s.io/cluster-api v1.7.7 h1:c+vNNg4qGD2lrVru8kjOeDKhjeYFacFdYg3rPrg9epc=
722+
sigs.k8s.io/cluster-api v1.7.7/go.mod h1:wmlCVPoxbFcHeZzp4Vgphi7I8nSXAgY3cqJFeaF2QLM=
723+
sigs.k8s.io/cluster-api/test v1.7.7 h1:0tq//ww0KlLXyICa+sbYyEBFeAsDtpifG1Z/ry9XJu4=
724+
sigs.k8s.io/cluster-api/test v1.7.7/go.mod h1:ckOdUw20CBIuoUxohDAYtC5Ko9UVHN5vdgXCQJbZ4XE=
725725
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
726726
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
727727
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎hack/install-cert-manager.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ source "${REPO_ROOT}/hack/common-vars.sh"
5454
make --directory="${REPO_ROOT}" "${KUBECTL##*/}"
5555

5656
## Install cert manager and wait for availability
57-
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.3/cert-manager.yaml
57+
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.16.0/cert-manager.yaml
5858
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
5959
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
6060
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

‎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.7.6
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.7
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.6
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.7
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.6
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.7
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.7.6
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.6/core-components.yaml
28+
- name: v1.7.7
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/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.7.6
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.6/bootstrap-components.yaml
51+
- name: v1.7.7
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/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.7.6
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.6/control-plane-components.yaml
73+
- name: v1.7.7
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -224,7 +224,7 @@ variables:
224224
SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}"
225225
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
226226
OLD_CAPI_UPGRADE_VERSION: "v1.6.8"
227-
LATEST_CAPI_UPGRADE_VERSION: "v1.7.6"
227+
LATEST_CAPI_UPGRADE_VERSION: "v1.7.7"
228228
OLD_PROVIDER_UPGRADE_VERSION: "v1.14.5"
229229
LATEST_PROVIDER_UPGRADE_VERSION: "v1.15.1"
230230
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)