Skip to content

bump go version to 1.25 #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 11, 2025
+48 −27
Merged

bump go version to 1.25 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab4af1e
dummy
Sep 27, 2025
2504df5
Merge branch 'rancher:master' into master
farazkhawaja Sep 30, 2025
0773071
bump go version to 1.25
Sep 27, 2025
a7b9564
update dep [rebase]
Sep 30, 2025
4669375
Update dockerfile components
Oct 5, 2025
33c9814
run go generate
Oct 6, 2025
76f78e2
Update golangci version
farazkhawaja Nov 9, 2025
bcc5a9a
Migration golangci config to v2
Nov 11, 2025
f758341
Delete .golangci.bck.json
farazkhawaja Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 38 additions & 17 deletions .golangci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
{
"linters": {
"disable-all": true,
"enable": [
"govet",
"goimports",
"misspell",
"ineffassign",
"gofmt"
]
},
"run": {
"exclude-files": [
"/zz_generated_"
],
"timeout": "5m"
}
}
"formatters": {
"enable": [
"gofmt",
"goimports"
],
"exclusions": {
"generated": "lax",
"paths": [
"third_party$",
"builtin$",
"examples$"
]
}
},
"linters": {
"default": "none",
"enable": [
"govet",
"ineffassign",
"misspell"
],
"exclusions": {
"generated": "lax",
"paths": [
"third_party$",
"builtin$",
"examples$"
],
"presets": [
"comments",
"common-false-positives",
"legacy",
"std-error-handling"
]
}
},
"version": "2"
}
8 changes: 4 additions & 4 deletions Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG KUBECTL=rancher/kubectl:v1.33.1
FROM ${KUBECTL} AS kubectl

FROM registry.suse.com/bci/golang:1.24
FROM registry.suse.com/bci/golang:1.25

COPY --from=kubectl /bin/kubectl /usr/local/bin/kubectl

Expand All @@ -10,7 +10,7 @@ ENV ARCH $DAPPER_HOST_ARCH
ARG SONOBUOY_VERSION=0.57.3
RUN zypper -n install expect git jq docker vim less file curl wget iproute2 gawk
RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.8; \
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.6.1; \
curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.6.0/kustomize_v5.6.0_linux_amd64.tar.gz" | tar -xz -C /usr/local/bin; \
curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${ARCH}.tar.gz" | tar -xz -C /usr/local/bin; \
curl -sL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose && \
Expand All @@ -19,8 +19,8 @@ RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
RUN mkdir -p /usr/local/lib/docker/cli-plugins; \
curl -o /usr/local/lib/docker/cli-plugins/docker-buildx -fsSL "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64"; \
chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3 && \
go install github.com/elastic/crd-ref-docs@v0.1.0
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 && \
go install github.com/elastic/crd-ref-docs@v0.2.0
ENV DAPPER_ENV REPO TAG DRONE_TAG
ENV DAPPER_SOURCE /go/src/github.com/rancher/system-upgrade-controller/
ENV DAPPER_OUTPUT ./bin ./dist
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/rancher/system-upgrade-controller

go 1.24.6
go 1.25.0
Copy link
Contributor Author

@farazkhawaja farazkhawaja Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brandond go 1.25.3 just released. should i change this line from go 1.25.0 to go 1.25.3 . toolchain needs to be changed aswell right?

Copy link
Member

@brandond brandond Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bci/golang:1.25 hardcodes GOTOOLCHAIN env var to whatever patch version is in the image. That said, the new patch release isn't available from BCI yet:

brandond@dev01:~$ docker run registry.suse.com/bci/golang:1.25 go version
go version go1.25.2 linux/amd64

Copy link
Contributor Author

@farazkhawaja farazkhawaja Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

PS C:\Users\pc\Desktop> docker run registry.suse.com/bci/golang:1.25 go version
go version go1.25.2 linux/amd64

@brandond is there any action item from our side to push for 1.25.3?

Copy link

@hammadsaedi hammadsaedi Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi; BCI got go 1.25.3

hammad.saeedi@Hammads-MacBook-Pro % docker run registry.suse.com/bci/golang:1.25 go version
go version go1.25.3 linux/arm64


toolchain go1.24.7
toolchain go1.25.1

replace (
github.com/distribution/reference => github.com/distribution/reference v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BCI=registry.suse.com/bci/bci-base:15.6
ARG GOLANG=registry.suse.com/bci/golang:1.24
ARG GOLANG=registry.suse.com/bci/golang:1.25
ARG ALPINE=alpine:3.22

FROM ${GOLANG} AS e2e-ginkgo
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/rancher/system-upgrade-controller/pkg/apis

go 1.24.0
go 1.25.0

toolchain go1.24.7
toolchain go1.25.1

require (
github.com/kubereboot/kured v1.13.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.19.0
name: plans.upgrade.cattle.io
spec:
group: upgrade.cattle.io
Expand Down
Loading