Skip to content

Commit bc3657d

Browse files
authored
Merge pull request #1140 from nader-ziada/0313
bump capi to 0.3.13
2 parents e52b0ce + dc6cfd7 commit bc3657d

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
440440
kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook
441441

442442
# Deploy CAPI
443-
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.12/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
443+
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
444444

445445
# Deploy CAPZ
446446
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
@@ -12,7 +12,7 @@ settings = {
1212
"deploy_cert_manager": True,
1313
"preload_images_for_kind": True,
1414
"kind_cluster_name": "capz",
15-
"capi_version": "v0.3.12",
15+
"capi_version": "v0.3.13",
1616
"cert_manager_version": "v0.16.1",
1717
"kubernetes_version": "v1.19.7",
1818
"aks_kubernetes_version": "v1.18.8"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
k8s.io/klog v1.0.0
3838
k8s.io/kubectl v0.17.14
3939
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
40-
sigs.k8s.io/cluster-api v0.3.12
40+
sigs.k8s.io/cluster-api v0.3.13
4141
sigs.k8s.io/controller-runtime v0.5.14
4242
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802
4343
)

go.sum

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
422422
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
423423
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
424424
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
425+
github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
425426
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
426427
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
427428
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -1257,8 +1258,8 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
12571258
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12581259
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12591260
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1260-
sigs.k8s.io/cluster-api v0.3.12 h1:iogA3mXvwRfNU3ZCZXbqM1ZVWUxtWobgu3zRd5IkMTM=
1261-
sigs.k8s.io/cluster-api v0.3.12/go.mod h1:KuUGKyD9+8TwYIcwoqDaScWKsee74/bpPo2sqQMwy8o=
1261+
sigs.k8s.io/cluster-api v0.3.13 h1:dyhvxgt3M00Co06jrM332i27Tfozu9a0EN/qcmQXUFg=
1262+
sigs.k8s.io/cluster-api v0.3.13/go.mod h1:qGxyPTEJWNpII9SBkeRwv+Xvy6EZRLLLzaxVfBLsBpA=
12621263
sigs.k8s.io/controller-runtime v0.5.14 h1:lmoRaPvLg9877ZOnjFivjtyIdqyLbWfcCEilxHXTEj4=
12631264
sigs.k8s.io/controller-runtime v0.5.14/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
12641265
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=

test/e2e/config/azure-dev.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ providers:
88
- name: cluster-api
99
type: CoreProvider
1010
versions:
11-
- name: v0.3.12
12-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.12/core-components.yaml
11+
- name: v0.3.13
12+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/core-components.yaml
1313
type: url
1414
replacements:
1515
- old: "imagePullPolicy: Always"
@@ -19,8 +19,8 @@ providers:
1919
- name: kubeadm
2020
type: BootstrapProvider
2121
versions:
22-
- name: v0.3.12
23-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.12/bootstrap-components.yaml
22+
- name: v0.3.13
23+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/bootstrap-components.yaml
2424
type: url
2525
replacements:
2626
- old: "imagePullPolicy: Always"
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: ControlPlaneProvider
3232
versions:
33-
- name: v0.3.12
34-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.12/control-plane-components.yaml
33+
- name: v0.3.13
34+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/control-plane-components.yaml
3535
type: url
3636
replacements:
3737
- old: "imagePullPolicy: Always"

0 commit comments

Comments
 (0)