From 95d151a54d2d6382a538c506fcee6115406342a9 Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 3 Mar 2026 09:03:08 +0100 Subject: [PATCH 1/2] bump golang to 1.25.7 On-behalf-of: @SAP robert.vasek@sap.com Signed-off-by: Robert Vasek --- .github/workflows/docs-gen-and-push.yaml | 2 +- .prow.yaml | 12 ++++++------ Dockerfile | 2 +- go.mod | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docs-gen-and-push.yaml b/.github/workflows/docs-gen-and-push.yaml index 65e33586..5723a3b4 100644 --- a/.github/workflows/docs-gen-and-push.yaml +++ b/.github/workflows/docs-gen-and-push.yaml @@ -36,7 +36,7 @@ jobs: - name: Setup Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # tag=v6.1.0 with: - go-version: v1.24.11 + go-version: v1.25.7 cache: true - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 #tag=v6.1.0 diff --git a/.prow.yaml b/.prow.yaml index c936fbda..20d22495 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -21,7 +21,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - hack/ci/verify.sh resources: @@ -37,7 +37,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - make - lint @@ -76,7 +76,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - make - test @@ -96,7 +96,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - hack/ci/run-e2e-tests.sh env: @@ -115,7 +115,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - hack/ci/run-e2e-tests.sh env: @@ -134,7 +134,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.24.11-1 + - image: ghcr.io/kcp-dev/infra/build:1.25.7-1 command: - hack/ci/run-e2e-tests.sh env: diff --git a/Dockerfile b/Dockerfile index f2eef687..45bbd6cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=${BUILDPLATFORM} docker.io/golang:1.24.11 AS builder +FROM --platform=${BUILDPLATFORM} docker.io/golang:1.25.7 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index fa0acb84..dd0c90a9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kcp-dev/api-syncagent -go 1.24.0 +go 1.25.7 replace github.com/kcp-dev/api-syncagent/sdk => ./sdk From 90aab9a1fff2c719da2a5cfb4d413fcd5070ba75 Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 3 Mar 2026 10:26:04 +0100 Subject: [PATCH 2/2] Makefile: bumped golangci-lint to 2.10.1 --- Makefile | 2 +- hack/tools.checksums | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9a7eba53..6091af0c 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ ENVTEST_ETCD_VERSION ?= 3.5.15 ENVTEST_KUBE_VERSION ?= v1.34.2 GIMPS_VERSION ?= 0.6.3 GOIMPORTS_VERSION ?= c70783e636f2213cac683f6865d88c5edace3157 -GOLANGCI_LINT_VERSION ?= 2.1.6 +GOLANGCI_LINT_VERSION ?= 2.10.1 KUBECTL_VERSION ?= v1.34.2 WWHRD_VERSION ?= 06b99400ca6db678386ba5dc39bbbdcdadb664ff YQ_VERSION ?= 4.44.6 diff --git a/hack/tools.checksums b/hack/tools.checksums index 488c4329..759a74bc 100644 --- a/hack/tools.checksums +++ b/hack/tools.checksums @@ -4,8 +4,8 @@ etcd|GOARCH=amd64;GOOS=linux|435d74510f3216bab1932fb6d7a6b5fe8245301143fcd25f7e6 etcd|GOARCH=arm64;GOOS=linux|cc8c645e5a8df0f35f2a5c51d9b9383037eef0cf0167c52e648457b3971a7a09 gimps|GOARCH=amd64;GOOS=linux|b597efc7e2c72097a44c001b41a06ccca97610963e1f1aec74c3d99c0e0b6c11 gimps|GOARCH=arm64;GOOS=linux|2588daec997b4f4b3a8d8875f780fd6faf3c39c933519e7899e19a686476c8e4 -golangci-lint|GOARCH=amd64;GOOS=linux|7009324a8aad93c1f84dce1c3cf61181bdd6b68e5f1b8b5d6971662258255050 -golangci-lint|GOARCH=arm64;GOOS=linux|c51ff5b21be688b043baea44de7dd855cf07b855c14f0de405bfaf922b1d7634 +golangci-lint|GOARCH=amd64;GOOS=linux|8a01a08dad47a14824d7d0f14af07c7144105fc079386c9c31fbe85f08f91643 +golangci-lint|GOARCH=arm64;GOOS=linux|2ed9cf2ad070dabc7947ba34cdc5142910be830306f063719898bc8fb44a7074 kube-apiserver|GOARCH=amd64;GOOS=linux|ca822082ec39e54a25836a4011ddb66e482e317a7a4f1a1f73882bbd2cf5a2a1 kube-apiserver|GOARCH=arm64;GOOS=linux|6ade6c2646e2c01fde1095407452afc2b65e89d6da16da29ee39f6223ccaf63b kubectl|GOARCH=amd64;GOOS=linux|9591f3d75e1581f3f7392e6ad119aab2f28ae7d6c6e083dc5d22469667f27253