Skip to content

Commit

Permalink
Bump CAPI to v1.8.10 in dev and test code
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Feb 19, 2025
1 parent f9f1a44 commit 511e13c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
./hack/create-custom-cloud-provider-config.sh

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

# Deploy CAAPH
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"
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capz",
"capi_version": "v1.8.8",
"capi_version": "v1.8.10",
"caaph_version": "v0.2.5",
"cert_manager_version": "v1.16.1",
"kubernetes_version": "v1.28.3",
Expand Down
20 changes: 10 additions & 10 deletions test/e2e/config/azure-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ managementClusterName: capz-e2e
images:
- name: ${MANAGER_IMAGE}
loadBehavior: mustLoad
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.8
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.10
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.8
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.10
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.8
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.10
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.2.5
loadBehavior: tryLoad
Expand All @@ -25,8 +25,8 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.8.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/core-components.yaml
- name: v1.8.10
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/core-components.yaml
type: url
contract: v1beta1
files:
Expand All @@ -48,8 +48,8 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.8.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/bootstrap-components.yaml
- name: v1.8.10
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/bootstrap-components.yaml
type: url
contract: v1beta1
files:
Expand All @@ -70,8 +70,8 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
- name: v1.8.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/control-plane-components.yaml
- name: v1.8.10
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/control-plane-components.yaml
type: url
contract: v1beta1
files:
Expand Down Expand Up @@ -228,7 +228,7 @@ variables:
SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}"
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
OLD_CAPI_UPGRADE_VERSION: "v1.7.9"
LATEST_CAPI_UPGRADE_VERSION: "v1.8.8"
LATEST_CAPI_UPGRADE_VERSION: "v1.8.10"
OLD_PROVIDER_UPGRADE_VERSION: "v1.15.3"
LATEST_PROVIDER_UPGRADE_VERSION: "v1.16.1"
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
Expand Down

0 comments on commit 511e13c

Please sign in to comment.