From d9ab098b26665738517c98a3dc673b4ea05434d7 Mon Sep 17 00:00:00 2001 From: YangMieMie Date: Wed, 12 Jun 2024 11:17:05 +0800 Subject: [PATCH] SKS-2057: Bump CAPI to v1.6.6 (#181) --- .go-version | 2 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- test/e2e/config/elf-dev.yaml | 24 ++++++++++++------------ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.go-version b/.go-version index f124bfa..88863fd 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.9 +1.21.11 diff --git a/Dockerfile b/Dockerfile index 87ce61b..adb2bce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG ARCH # Build the manager binary -FROM golang:1.21.9 as builder +FROM golang:1.21.11 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 edeacb1..2d52c58 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ VERSION ?= $(shell cat clusterctl-settings.json | jq .config.nextVersion -r) # # Go. # -GO_VERSION ?= 1.21.9 +GO_VERSION ?= 1.21.11 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/go.mod b/go.mod index d7522f2..99306d8 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( k8s.io/client-go v0.28.4 k8s.io/klog/v2 v2.100.1 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 - sigs.k8s.io/cluster-api v1.6.4 - sigs.k8s.io/cluster-api/test v1.6.4 + sigs.k8s.io/cluster-api v1.6.6 + sigs.k8s.io/cluster-api/test v1.6.6 sigs.k8s.io/controller-runtime v0.16.5 ) diff --git a/go.sum b/go.sum index 304afeb..d8fc9b2 100644 --- a/go.sum +++ b/go.sum @@ -1132,10 +1132,10 @@ 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.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= -sigs.k8s.io/cluster-api v1.6.4 h1:O3J+Dm/wBMAQSyTtdkEPcWbv4KyY4yqv8Q8g6pJVefM= -sigs.k8s.io/cluster-api v1.6.4/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= -sigs.k8s.io/cluster-api/test v1.6.4 h1:eNs1FtKEQqWKxBB19/cQ/1IAgb4nHT0qbh0w7T9yqZ4= -sigs.k8s.io/cluster-api/test v1.6.4/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= +sigs.k8s.io/cluster-api v1.6.6 h1:xXUHwM+4ZENzesQQSpRRtCRlBuW9fgknbgjwr0tHSfE= +sigs.k8s.io/cluster-api v1.6.6/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= +sigs.k8s.io/cluster-api/test v1.6.6 h1:Xb+mVv+Wq+R1RR7wPZOcQpcAWcTGeOPaavYG0tBmUDQ= +sigs.k8s.io/cluster-api/test v1.6.6/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/test/e2e/config/elf-dev.yaml b/test/e2e/config/elf-dev.yaml index b63b336..086faf6 100644 --- a/test/e2e/config/elf-dev.yaml +++ b/test/e2e/config/elf-dev.yaml @@ -11,27 +11,27 @@ # - from the CAPE repository root, `make test-e2e` to build the elf provider image and run e2e tests. images: - - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.6.4 + - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.6.6 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.6.4 + - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.6.6 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.6.4 + - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.6.6 loadBehavior: tryLoad - name: k8s.gcr.io/smartxworks/cape-manager:e2e loadBehavior: mustLoad - - name: quay.io/jetstack/cert-manager-cainjector:v1.14.4 + - name: quay.io/jetstack/cert-manager-cainjector:v1.15.0 loadBehavior: tryLoad - - name: quay.io/jetstack/cert-manager-webhook:v1.14.4 + - name: quay.io/jetstack/cert-manager-webhook:v1.15.0 loadBehavior: tryLoad - - name: quay.io/jetstack/cert-manager-controller:v1.14.4 + - name: quay.io/jetstack/cert-manager-controller:v1.15.0 loadBehavior: tryLoad providers: - name: cluster-api type: CoreProvider versions: - - name: v1.6.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/core-components.yaml" + - name: v1.6.6 # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/core-components.yaml" type: "url" contract: v1beta1 files: @@ -45,8 +45,8 @@ providers: files: - sourcePath: "../data/capi/metadata.yaml" versions: - - name: v1.6.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/bootstrap-components.yaml" + - name: v1.6.6 # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -60,8 +60,8 @@ providers: files: - sourcePath: "../data/capi/metadata.yaml" versions: - - name: v1.6.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/control-plane-components.yaml" + - name: v1.6.6 # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/control-plane-components.yaml" type: "url" contract: v1beta1 files: