Skip to content

Commit 8946088

Browse files
authored
Merge pull request #1168 from nader-ziada/capi-314-04
[back-port release-0.4] use cluster-api latest release v0.3.14
2 parents 3dbc0b9 + d7dfad6 commit 8946088

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-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.13/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
443+
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/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.13",
15+
"capi_version": "v0.3.14",
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.13
40+
sigs.k8s.io/cluster-api v0.3.14
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,8 +1258,8 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
12581258
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12591259
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12601260
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
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=
1261+
sigs.k8s.io/cluster-api v0.3.14 h1:kyAJY69tWXvyOs3e8GvDrg0H76qQOXEghcmiYOwFB7k=
1262+
sigs.k8s.io/cluster-api v0.3.14/go.mod h1:qGxyPTEJWNpII9SBkeRwv+Xvy6EZRLLLzaxVfBLsBpA=
12631263
sigs.k8s.io/controller-runtime v0.5.14 h1:lmoRaPvLg9877ZOnjFivjtyIdqyLbWfcCEilxHXTEj4=
12641264
sigs.k8s.io/controller-runtime v0.5.14/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
12651265
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.13
12-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/core-components.yaml
11+
- name: v0.3.14
12+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/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.13
23-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/bootstrap-components.yaml
22+
- name: v0.3.14
23+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/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.13
34-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/control-plane-components.yaml
33+
- name: v0.3.14
34+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/control-plane-components.yaml
3535
type: url
3636
replacements:
3737
- old: "imagePullPolicy: Always"

0 commit comments

Comments
 (0)