Skip to content

Commit 7887c72

Browse files
authored
Merge pull request #5887 from mboersma/bump-caaph
Bump CAAPH to v0.4.0
2 parents a47cdf5 + c83293b commit 7887c72

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
361361
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"
362362

363363
# Deploy CAAPH
364-
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"
364+
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"
365365

366366
# Deploy CAPZ
367367
if [ "$(MGMT_CLUSTER_TYPE)" != "aks" ]; then \

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ settings = {
2323
"preload_images_for_kind": True,
2424
"kind_cluster_name": "capz",
2525
"capi_version": "v1.10.4",
26-
"caaph_version": "v0.3.2",
26+
"caaph_version": "v0.4.0",
2727
"cert_manager_version": "v1.18.1",
2828
"kubernetes_version": "v1.32.2",
2929
"aks_kubernetes_version": "v1.30.2",

docs/book/src/developers/getting-started-with-capi-operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Create a `values.yaml` file for the CAPI Operator Helm chart like so:
122122
```yaml
123123
core: "cluster-api:v1.10.4"
124124
infrastructure: "azure:v1.17.2"
125-
addon: "helm:v0.3.2"
125+
addon: "helm:v0.4.0"
126126
manager:
127127
featureGates:
128128
core:

test/e2e/config/azure-dev.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ images:
99
loadBehavior: tryLoad
1010
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.4
1111
loadBehavior: tryLoad
12-
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.3.2
12+
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.4.0
1313
loadBehavior: tryLoad
1414

1515
providers:
@@ -205,8 +205,8 @@ providers:
205205
replacements:
206206
- old: "imagePullPolicy: Always"
207207
new: "imagePullPolicy: IfNotPresent"
208-
- name: v0.3.2
209-
value: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.3.2/addon-components.yaml
208+
- name: v0.4.0
209+
value: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.4.0/addon-components.yaml
210210
type: url
211211
contract: v1beta1
212212
files:
@@ -255,7 +255,7 @@ variables:
255255
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.6"
256256
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.2"
257257
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
258-
LATEST_CAAPH_UPGRADE_VERSION: "v0.3.2"
258+
LATEST_CAAPH_UPGRADE_VERSION: "v0.4.0"
259259
CI_RG: "${CI_RG:-capz-ci}"
260260
USER_IDENTITY: "${USER_IDENTITY:-cloud-provider-user-identity}"
261261
EXP_APISERVER_ILB: "true"

test/e2e/data/shared/v1beta1_addon_provider/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
22
releaseSeries:
3+
- major: 0
4+
minor: 4
5+
contract: v1beta1
36
- major: 0
47
minor: 3
58
contract: v1beta1

0 commit comments

Comments
 (0)