From f9b3d624137e5bc669fa18b8f1b436e2e1fdeeac Mon Sep 17 00:00:00 2001 From: Enrico Candino Date: Tue, 21 Jan 2025 10:50:23 +0100 Subject: [PATCH] bump go1.23 (#198) --- .github/workflows/test.yaml | 4 +--- Dockerfile.dapper | 6 ++---- go.mod | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ff10274e..3e507afc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,9 +30,7 @@ jobs: - name: Install tools run: | go install github.com/onsi/ginkgo/v2/ginkgo - - # With Golang 1.22 we need to use the release-0.18 branch - go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.18 + go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest ENVTEST_BIN=$(setup-envtest use -p path) sudo mkdir -p /usr/local/kubebuilder/bin diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 69c4b0bd..4d830b88 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=rancher/hardened-build-base:v1.22.2b1 +ARG GOLANG=rancher/hardened-build-base:v1.23.4b1 FROM ${GOLANG} ARG DAPPER_HOST_ARCH @@ -17,9 +17,7 @@ ENV CONTROLLER_GEN_VERSION v0.14.0 RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} # Tool to setup the envtest framework to run the controllers integration tests -# Note: With Golang 1.22 we need to use the release-0.18 branch -ENV SETUP_ENVTEST_VERSION release-0.18 -RUN go install sigs.k8s.io/controller-runtime/tools/setup-envtest@${SETUP_ENVTEST_VERSION} && \ +RUN go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && \ ENVTEST_BIN=$(setup-envtest use -p path) && \ mkdir -p /usr/local/kubebuilder/bin && \ cp $ENVTEST_BIN/* /usr/local/kubebuilder/bin diff --git a/go.mod b/go.mod index 5052237e..813d994b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/k3k -go 1.22.7 +go 1.23.4 replace ( github.com/google/cel-go => github.com/google/cel-go v0.17.7