update CAPI to 1.1.6 (#392)

* update CAPI to 1.1.6 Signed-off-by: cpanato <[email protected]> * update cert manager and calico Signed-off-by: cpanato <[email protected]> Signed-off-by: cpanato <[email protected]>
kubernetes-sigs · Sep 17, 2022 · a5a166a · a5a166a
1 parent ac3986f
commit a5a166a
Show file tree

Hide file tree

Showing 8 changed files with 311 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -431,7 +431,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	./hack/install-cert-manager.sh
 
 	# Deploy CAPI
-	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
+	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
 
 	# Deploy CAPDO
 	kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo

diff --git a/Tiltfile b/Tiltfile
@@ -16,7 +16,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capdo",
-    "capi_version": "v1.1.5",
+    "capi_version": "v1.1.6",
     "cert_manager_version": "v1.1.0",
     "kubernetes_version": "v1.22.3",
 }

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/cluster-api-provider-digitalocean
 go 1.17
 
 require (
-	github.com/digitalocean/godo v1.82.0
+	github.com/digitalocean/godo v1.83.0
 	github.com/go-logr/logr v1.2.3
 	github.com/miekg/dns v1.1.49
 	github.com/onsi/ginkgo v1.16.5
@@ -16,8 +16,8 @@ require (
 	k8s.io/client-go v0.23.6
 	k8s.io/klog/v2 v2.60.1
 	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
-	sigs.k8s.io/cluster-api v1.1.5
-	sigs.k8s.io/cluster-api/test v1.1.5
+	sigs.k8s.io/cluster-api v1.1.6
+	sigs.k8s.io/cluster-api/test v1.1.6
 	sigs.k8s.io/controller-runtime v0.11.2
 )
 
@@ -123,4 +123,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.5
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.6
diff --git a/go.sum b/go.sum
@@ -159,8 +159,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/digitalocean/godo v1.82.0 h1:lqAit46H1CqJGjh7LDbsamng/UMBME5rvmfH3Vb5Yy8=
-github.com/digitalocean/godo v1.82.0/go.mod h1:BPCqvwbjbGqxuUnIKB4EvS/AX7IDnNmt5fwvIkWo+ew=
+github.com/digitalocean/godo v1.83.0 h1:K9CveJyECNLwrQnGZG+ovgapr7l5OuvQ6xZSKKW9Nz0=
+github.com/digitalocean/godo v1.83.0/go.mod h1:BPCqvwbjbGqxuUnIKB4EvS/AX7IDnNmt5fwvIkWo+ew=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -1247,10 +1247,10 @@ 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/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
-sigs.k8s.io/cluster-api v1.1.5 h1:4gV3mg1mlwrm3bFWeXADfL9ILRyufjR47KpwBL3PT6Y=
-sigs.k8s.io/cluster-api v1.1.5/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
-sigs.k8s.io/cluster-api/test v1.1.5 h1:jukMEA50R3V6G7VcJMR7dMZJPd3Tuf0Orc/6CKuS9Ek=
-sigs.k8s.io/cluster-api/test v1.1.5/go.mod h1:NXFioUFKruk/PgpUt4QrprV9bN1rVUcm7OWao9dfesg=
+sigs.k8s.io/cluster-api v1.1.6 h1:fd0ap613+3YgKjZ28cN6GzPo5czyTcuyGPV4U60RtjA=
+sigs.k8s.io/cluster-api v1.1.6/go.mod h1:WBPgw1yJdvybx/U3Ib49T9Q4JurairgnA/s0afxuE/w=
+sigs.k8s.io/cluster-api/test v1.1.6 h1:FbmJk7CXM5zcv6mfni3sl3fdnJ4oKr/UXoBtHcSjzWg=
+sigs.k8s.io/cluster-api/test v1.1.6/go.mod h1:NXFioUFKruk/PgpUt4QrprV9bN1rVUcm7OWao9dfesg=
 sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA=
 sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=

diff --git a/hack/install-cert-manager.sh b/hack/install-cert-manager.sh
@@ -52,7 +52,7 @@ KUBECTL="${REPO_ROOT}/hack/tools/bin/kubectl"
 cd "${REPO_ROOT}" && make "${KUBECTL##*/}"
 
 ## Install cert manager and wait for availability
-"${KUBECTL}" apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.yaml
+"${KUBECTL}" apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.yaml
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
 "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

diff --git a/test/e2e/config/digitalocean-ci.yaml b/test/e2e/config/digitalocean-ci.yaml
@@ -7,8 +7,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/core-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/core-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/bootstrap-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/bootstrap-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/control-plane-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"

diff --git a/test/e2e/config/digitalocean-dev.yaml b/test/e2e/config/digitalocean-dev.yaml
@@ -7,8 +7,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/core-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/core-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/bootstrap-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/bootstrap-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v1.1.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/control-plane-components.yaml
+    - name: v1.1.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.6/control-plane-components.yaml
       type: "url"
       files:
       - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"