Merge pull request #371 from cpanato/update-capi-0317

capi: update capi to release v0.3.17
kubernetes-sigs · Jun 3, 2021 · 20a2519 · 20a2519
2 parents 5f5ddc2 + 332460a
commit 20a2519
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -344,7 +344,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	kubectl wait --for=condition=Available --timeout=5m apiservice v1beta1.webhook.cert-manager.io
 
 	# Deploy CAPI
-	wget -O- https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.16/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
+	wget -O- https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.17/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
 
 	# Deploy CAPG
 	kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi

diff --git a/go.mod b/go.mod
@@ -16,6 +16,6 @@ require (
 	k8s.io/client-go v0.17.13
 	k8s.io/klog v1.0.0
 	k8s.io/utils v0.0.0-20201015054608-420da100c033
-	sigs.k8s.io/cluster-api v0.3.16
+	sigs.k8s.io/cluster-api v0.3.17
 	sigs.k8s.io/controller-runtime v0.5.14
 )
diff --git a/go.sum b/go.sum
@@ -645,8 +645,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
-sigs.k8s.io/cluster-api v0.3.16 h1:hSIdfaNAHxZpB7r6W6iNoRjm4feqfeKgc0QorfYGyLo=
-sigs.k8s.io/cluster-api v0.3.16/go.mod h1:qGxyPTEJWNpII9SBkeRwv+Xvy6EZRLLLzaxVfBLsBpA=
+sigs.k8s.io/cluster-api v0.3.17 h1:ba1p/O2tUj5OnnLBO7YfZKrQ2rvVe/Rj0ACZalMr3Rk=
+sigs.k8s.io/cluster-api v0.3.17/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/gcp-ci.yaml b/test/e2e/config/gcp-ci.yaml
@@ -7,11 +7,11 @@
 
 images:
   # Use local dev images built source tree;
-  - name: gcr.io/k8s-staging-cluster-api/cluster-api-controller-amd64:v0.3.16
+  - name: gcr.io/k8s-staging-cluster-api/cluster-api-controller-amd64:v0.3.17
     loadBehavior: tryLoad
-  - name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller-amd64:v0.3.16
+  - name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller-amd64:v0.3.17
     loadBehavior: tryLoad
-  - name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller-amd64:v0.3.16
+  - name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller-amd64:v0.3.17
     loadBehavior: tryLoad
   - name: gcr.io/k8s-staging-cluster-api-gcp/cluster-api-gcp-controller:e2e
     loadBehavior: mustLoad
@@ -26,9 +26,9 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v0.3.16
+      - name: v0.3.17
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.16/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.17/core-components.yaml"
         type: "url"
         replacements:
           - old: "imagePullPolicy: Always"
@@ -38,9 +38,9 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: v0.3.16
+      - name: v0.3.17
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.16/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.17/bootstrap-components.yaml"
         type: "url"
         replacements:
           - old: "imagePullPolicy: Always"
@@ -50,9 +50,9 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: v0.3.16
+      - name: v0.3.17
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.16/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.17/control-plane-components.yaml"
         type: "url"
         replacements:
           - old: "imagePullPolicy: Always"