From 7bd41f0723a44874051094dd3dbbd6c26ba7d51d Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Mon, 28 Nov 2022 23:45:22 -0800 Subject: [PATCH] [release-1.2] Bump CAPI to V1.2.6 and Go to 1.18.8 (#428) * bump go to 1.18.8 Signed-off-by: cpanato * Bump CAPI to V1.2.6 Signed-off-by: cpanato Signed-off-by: cpanato Co-authored-by: cpanato --- Dockerfile | 2 +- Makefile | 4 ++-- Tiltfile | 2 +- go.mod | 8 ++++---- go.sum | 12 ++++++------ test/e2e/config/digitalocean-ci.yaml | 12 ++++++------ test/e2e/config/digitalocean-dev.yaml | 12 ++++++------ 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09178de5f..730390361 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.18.7 as builder +FROM golang:1.18.8 as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy diff --git a/Makefile b/Makefile index 56226a1c9..01bc05f39 100644 --- a/Makefile +++ b/Makefile @@ -381,7 +381,7 @@ release-binary: $(RELEASE_DIR) -e GOARCH=$(GOARCH) \ -v "$$(pwd):/workspace" \ -w /workspace \ - golang:1.18.5 \ + golang:1.18.8 \ go build -a -trimpath -ldflags '-extldflags "-static"' \ -o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY) @@ -427,7 +427,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.2.4/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f - + curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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 index 9c5f68a24..c3b04fef2 100644 --- 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.2.4", + "capi_version": "v1.2.6", "cert_manager_version": "v1.1.0", "kubernetes_version": "v1.22.3", } diff --git a/go.mod b/go.mod index d7e775e70..1537a92aa 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( k8s.io/client-go v0.24.4 k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - sigs.k8s.io/cluster-api v1.2.4 - sigs.k8s.io/cluster-api/test v1.2.4 + sigs.k8s.io/cluster-api v1.2.6 + sigs.k8s.io/cluster-api/test v1.2.6 sigs.k8s.io/controller-runtime v0.12.3 ) @@ -44,7 +44,7 @@ require ( github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect - github.com/emicklei/go-restful v2.15.0+incompatible // indirect + github.com/emicklei/go-restful v2.16.0+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect @@ -127,4 +127,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.4 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.6 diff --git a/go.sum b/go.sum index 1bcf6a70f..cb20cd6ad 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.15.0+incompatible h1:8KpYO/Xl/ZudZs5RNOEhWMBY4hmzlZhhRd9cu+jrZP4= -github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM= +github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -1108,10 +1108,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.2.4 h1:wxfm/p8y+Q3qWVkkIPAIVqabA5lJVvqoRA02Nhup3uk= -sigs.k8s.io/cluster-api v1.2.4/go.mod h1:YaLJOC9mSsIOpdbh7BpthGmC8uxIJADzrMMIGpgahfM= -sigs.k8s.io/cluster-api/test v1.2.4 h1:hdYZ8HcQU2kYguE90EreRtzh7Zg6/tG9vW6JafdKX6M= -sigs.k8s.io/cluster-api/test v1.2.4/go.mod h1:C+UT2CXWNu3eAoeI0HHI19ex90pAdzAqR6YjhxRNHyM= +sigs.k8s.io/cluster-api v1.2.6 h1:wueslUK8LdTH8rOI697WIj1jutbaGY3a24t4XjZvLI8= +sigs.k8s.io/cluster-api v1.2.6/go.mod h1:Ye5gn15u+q6VcE+Se7nBMSo6INm55F+zBcCiWzrjxFc= +sigs.k8s.io/cluster-api/test v1.2.6 h1:QGcLuLsKkjnd6bEAQ9DKVpZJ4PbgvHe8pFV1Nt5dUGA= +sigs.k8s.io/cluster-api/test v1.2.6/go.mod h1:uDGdxAADhTIuQoHoGSYehqMWKQ9sR4/LGE8y2k0Y2LM= sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= diff --git a/test/e2e/config/digitalocean-ci.yaml b/test/e2e/config/digitalocean-ci.yaml index 936b78905..e91d201e6 100644 --- 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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/core-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/bootstrap-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/control-plane-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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 index 5b966d4c5..115483960 100644 --- 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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/core-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/bootstrap-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.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.2.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/control-plane-components.yaml + - name: v1.2.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/control-plane-components.yaml type: "url" files: - sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"