Merge pull request #1168 from nader-ziada/capi-314-04

[back-port release-0.4] use cluster-api latest release v0.3.14
kubernetes-sigs · Feb 9, 2021 · 8946088 · 8946088
2 parents 3dbc0b9 + d7dfad6
commit 8946088
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -440,7 +440,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook
 
 	# Deploy CAPI
-	curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
+	curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
 
 	# Deploy CAPZ
 	kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

diff --git a/Tiltfile b/Tiltfile
@@ -12,7 +12,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v0.3.13",
+    "capi_version": "v0.3.14",
     "cert_manager_version": "v0.16.1",
     "kubernetes_version": "v1.19.7",
     "aks_kubernetes_version": "v1.18.8"

diff --git a/go.mod b/go.mod
@@ -37,7 +37,7 @@ require (
 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.17.14
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
-	sigs.k8s.io/cluster-api v0.3.13
+	sigs.k8s.io/cluster-api v0.3.14
 	sigs.k8s.io/controller-runtime v0.5.14
 	sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802
 )

diff --git a/go.sum b/go.sum
@@ -1258,8 +1258,8 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/cluster-api v0.3.13 h1:dyhvxgt3M00Co06jrM332i27Tfozu9a0EN/qcmQXUFg=
-sigs.k8s.io/cluster-api v0.3.13/go.mod h1:qGxyPTEJWNpII9SBkeRwv+Xvy6EZRLLLzaxVfBLsBpA=
+sigs.k8s.io/cluster-api v0.3.14 h1:kyAJY69tWXvyOs3e8GvDrg0H76qQOXEghcmiYOwFB7k=
+sigs.k8s.io/cluster-api v0.3.14/go.mod h1:qGxyPTEJWNpII9SBkeRwv+Xvy6EZRLLLzaxVfBLsBpA=
 sigs.k8s.io/controller-runtime v0.5.14 h1:lmoRaPvLg9877ZOnjFivjtyIdqyLbWfcCEilxHXTEj4=
 sigs.k8s.io/controller-runtime v0.5.14/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
 sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=

diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -8,8 +8,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v0.3.13
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/core-components.yaml
+      - name: v0.3.14
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/core-components.yaml
         type: url
         replacements:
           - old: "imagePullPolicy: Always"
@@ -19,8 +19,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: v0.3.13
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/bootstrap-components.yaml
+      - name: v0.3.14
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/bootstrap-components.yaml
         type: url
         replacements:
           - old: "imagePullPolicy: Always"
@@ -30,8 +30,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: v0.3.13
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.13/control-plane-components.yaml
+      - name: v0.3.14
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/control-plane-components.yaml
         type: url
         replacements:
           - old: "imagePullPolicy: Always"