Merge pull request #503 from cpanato/update-capi-release-v1alpha4

[release-0.4] update go to 1.16.13 and capi to v0.4.7
kubernetes-sigs · Feb 7, 2022 · 0783bf5 · 0783bf5
2 parents 0921269 + 2082f0e
commit 0783bf5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.16.7 as builder
+FROM golang:1.16.13 as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ endif
 # Build time versioning details.
 LDFLAGS := $(shell hack/version.sh)
 
-GOLANG_VERSION := 1.16.8
+GOLANG_VERSION := 1.16.13
 
 # CI
 CAPG_WORKER_CLUSTER_KUBECONFIG ?= "/tmp/kubeconfig"

diff --git a/Tiltfile b/Tiltfile
@@ -16,7 +16,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capg",
-    "capi_version": "v0.4.4",
+    "capi_version": "v0.4.7",
     "cert_manager_version": "v1.1.0",
     "kubernetes_version": "v1.21.4",
 }

diff --git a/go.mod b/go.mod
@@ -17,9 +17,9 @@ require (
 	k8s.io/component-base v0.22.2
 	k8s.io/klog/v2 v2.10.0
 	k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e
-	sigs.k8s.io/cluster-api v0.4.4
-	sigs.k8s.io/cluster-api/test v0.4.4
+	sigs.k8s.io/cluster-api v0.4.7
+	sigs.k8s.io/cluster-api/test v0.4.7
 	sigs.k8s.io/controller-runtime v0.10.2
 )
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.4
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.7
diff --git a/go.sum b/go.sum
@@ -1526,10 +1526,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/cluster-api v0.4.4 h1:gTSjXQEfSwphgYMelKEZZPXvok06GCF5tsCC550A5zA=
-sigs.k8s.io/cluster-api v0.4.4/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
-sigs.k8s.io/cluster-api/test v0.4.4 h1:Xt9PX7JVAWmAOL8H4MkRTYhxBIuhuqP1D4sA+S+CuUE=
-sigs.k8s.io/cluster-api/test v0.4.4/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
+sigs.k8s.io/cluster-api v0.4.7 h1:XzIn48gZAEDyxP/fMcGqOfrgMSLwbcUMgyPRqMeZTjs=
+sigs.k8s.io/cluster-api v0.4.7/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
+sigs.k8s.io/cluster-api/test v0.4.7 h1:v+CNc+nW4lolK+mHdnUvQheSbiR6kcbA/8dKgu2VALI=
+sigs.k8s.io/cluster-api/test v0.4.7/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
 sigs.k8s.io/controller-runtime v0.9.7/go.mod h1:nExcHcQ2zvLMeoO9K7rOesGCmgu32srN5SENvpAEbGA=
 sigs.k8s.io/controller-runtime v0.10.2 h1:jW8qiY+yMnnPx6O9hu63tgcwaKzd1yLYui+mpvClOOc=
 sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=

diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh
@@ -22,7 +22,7 @@ set -o pipefail
 verify_go_version() {
   if [[ -z "$(command -v go)" ]]; then
     if [[ "${INSTALL_GO:-"true"}" == "true" ]]; then
-      curl -sSL https://golang.org/dl/go${GO_VERSION:-"1.16.5"}.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+      curl -sSL https://golang.org/dl/go${GO_VERSION:-"1.16.13"}.linux-amd64.tar.gz | tar -C /usr/local -xzf -
       export PATH=/usr/local/go/bin:$PATH
       export PATH=$(go env GOPATH)/bin:$PATH
     else

diff --git a/test/e2e/config/gcp-ci.yaml b/test/e2e/config/gcp-ci.yaml
@@ -15,8 +15,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-    - name: v0.4.4
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/core-components.yaml
+    - name: v0.4.7
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/core-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -28,8 +28,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v0.4.4
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/bootstrap-components.yaml
+    - name: v0.4.7
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/bootstrap-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -41,8 +41,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v0.4.4
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/control-plane-components.yaml
+    - name: v0.4.7
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/control-plane-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -54,7 +54,7 @@ providers:
   - name: gcp
     type: InfrastructureProvider
     versions:
-    - name: v0.4.4
+    - name: v0.4.7
       value: "${PWD}/config/default"
     files:
     - sourcePath: "${PWD}/metadata.yaml"