Skip to content

Commit fcfc53f

Browse files
authored
Merge pull request #3136 from mboersma/bump-to-capi-v1.3.3
bump CAPI to v1.3.3
2 parents f304a55 + c163147 commit fcfc53f

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
279279
./hack/create-custom-cloud-provider-config.sh
280280

281281
# Deploy CAPI
282-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
282+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
283283

284284
# Deploy CAPZ
285285
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capz",
22-
"capi_version": "v1.3.2",
22+
"capi_version": "v1.3.3",
2323
"cert_manager_version": "v1.11.0",
2424
"kubernetes_version": "v1.24.6",
2525
"aks_kubernetes_version": "v1.24.6",

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ require (
4646
k8s.io/kubectl v0.25.2
4747
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
4848
sigs.k8s.io/cloud-provider-azure v1.25.5
49-
sigs.k8s.io/cluster-api v1.3.2
50-
sigs.k8s.io/cluster-api/test v1.3.2
49+
sigs.k8s.io/cluster-api v1.3.3
50+
sigs.k8s.io/cluster-api/test v1.3.3
5151
sigs.k8s.io/controller-runtime v0.13.1
5252
sigs.k8s.io/kind v0.17.0
5353
)
@@ -220,4 +220,4 @@ require (
220220
sigs.k8s.io/yaml v1.3.0 // indirect
221221
)
222222

223-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.2
223+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.3

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,10 +1284,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12841284
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12851285
sigs.k8s.io/cloud-provider-azure v1.25.5 h1:YRq/wStyUtxgtMrAuRg+4FS0Gylt6MRatA8z5uag0/s=
12861286
sigs.k8s.io/cloud-provider-azure v1.25.5/go.mod h1:estRnm6TL3dWLQTVoej4+0ygXyhIZmpszBXipHrfuZ0=
1287-
sigs.k8s.io/cluster-api v1.3.2 h1:DkkaVASrxgOP4hT24ndGwfge8+YjHKuAyZBSGJwAlq4=
1288-
sigs.k8s.io/cluster-api v1.3.2/go.mod h1:nnXmR51rHshpMEXmB4LZIwdiXWKXV6yaooB1KzrL0Qs=
1289-
sigs.k8s.io/cluster-api/test v1.3.2 h1:+EH9OwoIJ/UpGntRRhNxwIZkW3hx2pEn6aQrm7pRuJE=
1290-
sigs.k8s.io/cluster-api/test v1.3.2/go.mod h1:HKkh1O4lALo51GsXVIJ1rQNyLRE+CbEVcA+f/1gU5Rw=
1287+
sigs.k8s.io/cluster-api v1.3.3 h1:sHRAbuev6+bz3OAySmdmT62md/D/UUIy0EYwvP38H/4=
1288+
sigs.k8s.io/cluster-api v1.3.3/go.mod h1:nnXmR51rHshpMEXmB4LZIwdiXWKXV6yaooB1KzrL0Qs=
1289+
sigs.k8s.io/cluster-api/test v1.3.3 h1:AzX6zWneNOv3umK9PnhON5kjt2MJaw0jvFl39ReWL28=
1290+
sigs.k8s.io/cluster-api/test v1.3.3/go.mod h1:HKkh1O4lALo51GsXVIJ1rQNyLRE+CbEVcA+f/1gU5Rw=
12911291
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
12921292
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
12931293
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

test/e2e/config/azure-dev.yaml

Lines changed: 9 additions & 9 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.3.2
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.3.3
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.3.2
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.3.3
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.3.2
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.3.3
1111
loadBehavior: tryLoad
1212

1313
providers:
@@ -23,8 +23,8 @@ providers:
2323
new: --metrics-addr=:8080
2424
files:
2525
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
26-
- name: v1.3.2
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/core-components.yaml
26+
- name: v1.3.3
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/core-components.yaml
2828
type: url
2929
contract: v1beta1
3030
files:
@@ -46,8 +46,8 @@ providers:
4646
new: --metrics-addr=:8080
4747
files:
4848
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
49-
- name: v1.3.2
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/bootstrap-components.yaml
49+
- name: v1.3.3
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/bootstrap-components.yaml
5151
type: url
5252
contract: v1beta1
5353
files:
@@ -68,8 +68,8 @@ providers:
6868
new: --metrics-addr=:8080
6969
files:
7070
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
71-
- name: v1.3.2
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/control-plane-components.yaml
71+
- name: v1.3.3
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:

0 commit comments

Comments
 (0)