diff --git a/Makefile b/Makefile index b28721c59ec..caae7aafd71 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/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.3.2/addon-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-addon-provider-helm/releases/download/v0.4.0/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" # Deploy CAPZ if [ "$(MGMT_CLUSTER_TYPE)" != "aks" ]; then \ diff --git a/Tiltfile b/Tiltfile index 4d2681ac611..a608114e557 100644 --- a/Tiltfile +++ b/Tiltfile @@ -23,7 +23,7 @@ settings = { "preload_images_for_kind": True, "kind_cluster_name": "capz", "capi_version": "v1.10.4", - "caaph_version": "v0.3.2", + "caaph_version": "v0.4.0", "cert_manager_version": "v1.18.1", "kubernetes_version": "v1.32.2", "aks_kubernetes_version": "v1.30.2", diff --git a/docs/book/src/developers/getting-started-with-capi-operator.md b/docs/book/src/developers/getting-started-with-capi-operator.md index 0dedf998943..a907e2f5adc 100644 --- a/docs/book/src/developers/getting-started-with-capi-operator.md +++ b/docs/book/src/developers/getting-started-with-capi-operator.md @@ -122,7 +122,7 @@ Create a `values.yaml` file for the CAPI Operator Helm chart like so: ```yaml core: "cluster-api:v1.10.4" infrastructure: "azure:v1.17.2" -addon: "helm:v0.3.2" +addon: "helm:v0.4.0" manager: featureGates: core: diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index 1973c5025bd..5224131ea93 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -9,7 +9,7 @@ images: loadBehavior: tryLoad - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.4 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.3.2 + - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.4.0 loadBehavior: tryLoad providers: @@ -205,8 +205,8 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v0.3.2 - value: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.3.2/addon-components.yaml + - name: v0.4.0 + value: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.4.0/addon-components.yaml type: url contract: v1beta1 files: @@ -255,7 +255,7 @@ variables: OLD_PROVIDER_UPGRADE_VERSION: "v1.19.6" LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.2" OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10" - LATEST_CAAPH_UPGRADE_VERSION: "v0.3.2" + LATEST_CAAPH_UPGRADE_VERSION: "v0.4.0" CI_RG: "${CI_RG:-capz-ci}" USER_IDENTITY: "${USER_IDENTITY:-cloud-provider-user-identity}" EXP_APISERVER_ILB: "true" diff --git a/test/e2e/data/shared/v1beta1_addon_provider/metadata.yaml b/test/e2e/data/shared/v1beta1_addon_provider/metadata.yaml index ae71f5805be..45731d2a88e 100644 --- a/test/e2e/data/shared/v1beta1_addon_provider/metadata.yaml +++ b/test/e2e/data/shared/v1beta1_addon_provider/metadata.yaml @@ -1,5 +1,8 @@ apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 releaseSeries: + - major: 0 + minor: 4 + contract: v1beta1 - major: 0 minor: 3 contract: v1beta1