Skip to content

Commit 8271c14

Browse files
authored
bump go version to 1.25 (#382)
* bump go version to 1.25 * run go generate * Update golangci version * Migration golangci config to v2 Signed-off-by: Khwaja Faraz Ahmed <[email protected]>
1 parent f2c9e60 commit 8271c14

File tree

6 files changed

+48
-27
lines changed

6 files changed

+48
-27
lines changed

.golangci.json

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,39 @@
11
{
2-
"linters": {
3-
"disable-all": true,
4-
"enable": [
5-
"govet",
6-
"goimports",
7-
"misspell",
8-
"ineffassign",
9-
"gofmt"
10-
]
11-
},
12-
"run": {
13-
"exclude-files": [
14-
"/zz_generated_"
15-
],
16-
"timeout": "5m"
17-
}
18-
}
2+
"formatters": {
3+
"enable": [
4+
"gofmt",
5+
"goimports"
6+
],
7+
"exclusions": {
8+
"generated": "lax",
9+
"paths": [
10+
"third_party$",
11+
"builtin$",
12+
"examples$"
13+
]
14+
}
15+
},
16+
"linters": {
17+
"default": "none",
18+
"enable": [
19+
"govet",
20+
"ineffassign",
21+
"misspell"
22+
],
23+
"exclusions": {
24+
"generated": "lax",
25+
"paths": [
26+
"third_party$",
27+
"builtin$",
28+
"examples$"
29+
],
30+
"presets": [
31+
"comments",
32+
"common-false-positives",
33+
"legacy",
34+
"std-error-handling"
35+
]
36+
}
37+
},
38+
"version": "2"
39+
}

Dockerfile.dapper

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG KUBECTL=rancher/kubectl:v1.33.1
22
FROM ${KUBECTL} AS kubectl
33

4-
FROM registry.suse.com/bci/golang:1.24
4+
FROM registry.suse.com/bci/golang:1.25
55

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

@@ -10,7 +10,7 @@ ENV ARCH $DAPPER_HOST_ARCH
1010
ARG SONOBUOY_VERSION=0.57.3
1111
RUN zypper -n install expect git jq docker vim less file curl wget iproute2 gawk
1212
RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
13-
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.8; \
13+
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.6.1; \
1414
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; \
1515
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; \
1616
curl -sL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose && \
@@ -19,8 +19,8 @@ RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
1919
RUN mkdir -p /usr/local/lib/docker/cli-plugins; \
2020
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"; \
2121
chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
22-
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3 && \
23-
go install github.com/elastic/crd-ref-docs@v0.1.0
22+
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 && \
23+
go install github.com/elastic/crd-ref-docs@v0.2.0
2424
ENV DAPPER_ENV REPO TAG DRONE_TAG
2525
ENV DAPPER_SOURCE /go/src/github.com/rancher/system-upgrade-controller/
2626
ENV DAPPER_OUTPUT ./bin ./dist

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rancher/system-upgrade-controller
22

3-
go 1.24.6
3+
go 1.25.0
44

5-
toolchain go1.24.7
5+
toolchain go1.25.1
66

77
replace (
88
github.com/distribution/reference => github.com/distribution/reference v0.5.0

package/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BCI=registry.suse.com/bci/bci-base:15.6
2-
ARG GOLANG=registry.suse.com/bci/golang:1.24
2+
ARG GOLANG=registry.suse.com/bci/golang:1.25
33
ARG ALPINE=alpine:3.22
44

55
FROM ${GOLANG} AS e2e-ginkgo

pkg/apis/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rancher/system-upgrade-controller/pkg/apis
22

3-
go 1.24.0
3+
go 1.25.0
44

5-
toolchain go1.24.7
5+
toolchain go1.25.1
66

77
require (
88
github.com/kubereboot/kured v1.13.1

pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: plans.upgrade.cattle.io
88
spec:
99
group: upgrade.cattle.io

0 commit comments

Comments
 (0)