leftyer/rancher
1
0
Fork 0
mirror of https://gitee.com/rancher/rancher.git synced 2025-12-06 07:49:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump Go to 1.25 (#51657)

Browse Source
This commit is contained in:
Peter Matseykanets
2025-12-02 13:24:40 -05:00
committed by GitHub
parent d728bba49c
commit 1ae24e1e95
13 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/integration-tests.yml vendored
View File

@@ -7,7 +7,7 @@ env:
HOST_ARCH: amd64
ARCH: amd64
PYTHON_VERSION: '3.11'
GOLANG_VERSION: '1.24'
GOLANG_VERSION: '1.25'
IMAGE: ${{ github.repository_owner }}/rancher
IMAGE_AGENT: ${{ github.repository_owner }}/rancher-agent
REPO: ${{ github.repository_owner }}

5
.github/workflows/unit-test.yml vendored
View File

@@ -15,6 +15,11 @@ jobs:
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
with:
go-version-file: 'go.mod'
# https://github.com/golang/go/issues/75031
- name: Set toolchain version
run: go env -w GOTOOLCHAIN=go1.25.4+auto
- name: Run unit tests
run: go test -cover -tags=test ./pkg/...

2
.github/workflows/validate.yml vendored
View File

@@ -6,7 +6,7 @@ jobs:
container: registry.suse.com/bci/python:3.11
env:
GOLANG_CI_LINT_VERSION: v1.54.2
GOLANG_VERSION: '1.24'
GOLANG_VERSION: '1.25'
steps:
- name: Install dependencies
shell: bash

2
.github/workflows/verify-generated-code-changes.yml vendored
View File

@@ -11,7 +11,7 @@ env:
MAIN_BRANCH: origin/main
GOARCH: amd64
CGO_ENABLED: 0
SETUP_GO_VERSION: '1.24.*'
SETUP_GO_VERSION: '1.25.*'
jobs:
check-changes:

2
Dockerfile-windows.dapper
View File

@@ -1,4 +1,4 @@
FROM library/golang:1.24
FROM library/golang:1.25
SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG DAPPER_HOST_ARCH

2
Dockerfile.dapper
View File

@@ -1,4 +1,4 @@
FROM registry.suse.com/bci/golang:1.24
FROM registry.suse.com/bci/golang:1.25
ARG DAPPER_HOST_ARCH
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}

4
go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
replace (
github.com/crewjam/saml => github.com/rancher/saml v0.4.14-rancher3

4
gotools/controller-gen/go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher/gotools/controller-gen
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
tool sigs.k8s.io/controller-tools/cmd/controller-gen

4
gotools/mockgen/go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher/gotools/mockgen
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
tool go.uber.org/mock/mockgen

4
hack/airgap/go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher/airgap
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.7.29 // CVE-2024-40635

2
package/Dockerfile
View File

@@ -69,7 +69,7 @@ RUN zypper refresh && \
FROM final AS builder
COPY --from=chroot-builder-server /chroot/ /
FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.24 AS go-builder
FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.25 AS go-builder
ARG CGO_ENABLED=0
ENV CGO_ENABLED=$CGO_ENABLED
ENV GOMODCACHE=/root/.cache/go/modcache

4
pkg/apis/go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher/pkg/apis
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
replace (
k8s.io/api => k8s.io/api v0.34.1

4
pkg/client/go.mod
View File

@@ -1,8 +1,8 @@
module github.com/rancher/rancher/pkg/client
go 1.24.0
go 1.25.0
toolchain go1.24.9
toolchain go1.25.4
require (
github.com/rancher/norman v0.8.0