Skip to content

Commit 49855a9

Browse files
Teja78906Teja78906
committed
[release-v2.11] update go version to 1.25
1 parent b28ab86 commit 49855a9

13 files changed

Lines changed: 200 additions & 179 deletions

File tree

‎.github/workflows/apidiff.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
fetch-depth: 0
1313
- uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
1414
with:
15-
go-version: 1.24.x
15+
go-version: 1.25.x
1616
- name: Generate API diff
1717
run: make apidiff

‎.github/workflows/e2e-branch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install Go
4949
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
5050
with:
51-
go-version: 1.24.x
51+
go-version: 1.25.x
5252
- uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
5353
with:
5454
version: v0.23.0

‎.github/workflows/lint.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
- name: Install Go
1717
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
1818
with:
19-
go-version: 1.24.x
19+
go-version: 1.25.x
2020
- name: Analysis
21-
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
21+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9
2222
with:
23+
version: v2.8.0
2324
args: -v

‎.github/workflows/unit.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install Go
1414
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
1515
with:
16-
go-version: 1.24.x
16+
go-version: 1.25.x
1717
- name: Run tests
1818
run: |
1919
make test

‎.github/workflows/update-rancher-dep.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Setup Go
4343
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4444
with:
45-
go-version: '1.24.*'
45+
go-version: '1.25.*'
4646
- name: Set env variables
4747
run: |
4848
echo "TIMESTAMP=$(date +'%s')" >> $GITHUB_ENV

‎.github/workflows/verify.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install Go
1414
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
1515
with:
16-
go-version: 1.24.x
16+
go-version: 1.25.x
1717
- name: Run make verify
1818
run: |
1919
make verify

‎.golangci.yml‎

Lines changed: 101 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,108 @@
1+
version: "2"
12
run:
23
timeout: 5m
3-
go: "1.24"
4+
go: "1.25"
45
tests: false
56
allow-parallel-runners: true
6-
7-
output:
8-
formats:
9-
- format: github-actions
10-
117
linters:
12-
disable-all: true
8+
default: none
139
enable:
14-
- dupl # check duplicated code
15-
- goconst # check strings that can turn into constants
16-
- gofmt # check fmt
17-
- goimports # check imports
18-
- gosec # check for security problems
19-
- govet # check vet
20-
- importas # check consistent import aliasing
21-
- ineffassign # check ineffectual assignments
22-
- misspell # check for misspelled English words
23-
- nakedret # check naked returns in functions
24-
- prealloc # check preallocated slice declarations
25-
- revive # replacement for golint
26-
- unconvert # check redundant type conversions
27-
- whitespace # check for trailing whitespace and tabs
28-
linters-settings:
29-
revive:
30-
rules:
31-
# The following rules are recommended https://github.com/mgechev/revive#recommended-configuration
32-
- name: blank-imports
33-
- name: context-as-argument
34-
- name: context-keys-type
35-
- name: dot-imports
36-
- name: error-return
37-
- name: error-strings
38-
- name: error-naming
39-
- name: exported
40-
- name: increment-decrement
41-
- name: var-naming
42-
- name: var-declaration
43-
- name: package-comments
44-
- name: range
45-
- name: receiver-naming
46-
- name: time-naming
47-
- name: indent-error-flow
48-
- name: errorf
49-
- name: empty-block
50-
- name: superfluous-else
51-
- name: unused-parameter
52-
- name: unreachable-code
53-
- name: redefines-builtin-id
54-
importas:
55-
no-unaliased: true
56-
alias:
57-
# Kubernetes
58-
- pkg: k8s.io/api/core/v1
59-
alias: corev1
60-
- pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
61-
alias: apiextensionsv1
62-
- pkg: k8s.io/api/apps/v1
63-
alias: appsv1
64-
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
65-
alias: metav1
66-
- pkg: k8s.io/apimachinery/pkg/util/runtime
67-
alias: utilruntime
68-
- pkg: sigs.k8s.io/controller-runtime/pkg/client
69-
alias: runtimeclient
70-
- pkg: k8s.io/apimachinery/pkg/util/errors
71-
alias: kerrors
72-
- pkg: k8s.io/client-go/kubernetes/scheme
73-
alias: clientgoscheme
74-
# Rancher GKE operator
75-
- pkg: github.com/rancher/gke-operator/pkg/apis/gke.cattle.io/v1
76-
alias: gkev1
77-
- pkg: github.com/rancher/gke-operator/pkg/generated/controllers/gke.cattle.io/v1
78-
alias: gkecontrollers
79-
# Golang API
80-
- pkg: google.golang.org/api/container/v1
81-
alias: gkeapi
82-
issues:
83-
exclude-rules:
84-
- linters:
10+
- dupl
11+
- goconst
12+
- gosec
13+
- govet
14+
- importas
15+
- ineffassign
16+
- misspell
17+
- nakedret
18+
- prealloc
8519
- revive
86-
text: "var-naming: don't use an underscore in package name"
87-
path: 'mock(\w+)/doc.go$'
88-
exclude-dirs:
89-
- pkg/generated
90-
exclude-files:
91-
- "zz_generated_*"
20+
- unconvert
21+
- whitespace
22+
settings:
23+
importas:
24+
alias:
25+
- pkg: k8s.io/api/core/v1
26+
alias: corev1
27+
- pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
28+
alias: apiextensionsv1
29+
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
30+
alias: metav1
31+
- pkg: k8s.io/apimachinery/pkg/util/runtime
32+
alias: utilruntime
33+
- pkg: sigs.k8s.io/controller-runtime/pkg/client
34+
alias: runtimeclient
35+
- pkg: github.com/rancher/eks-operator/pkg/apis/eks.cattle.io/v1
36+
alias: eksv1
37+
- pkg: github.com/rancher/eks-operator/pkg/generated/controllers/eks.cattle.io/v1
38+
alias: ekscontrollers
39+
- pkg: github.com/rancher/eks-operator/pkg/eks
40+
alias: awsservices
41+
- pkg: github.com/rancher/rancher/pkg/apis/management.cattle.io/v3
42+
alias: managementv3
43+
no-unaliased: true
44+
revive:
45+
rules:
46+
- name: blank-imports
47+
- name: context-as-argument
48+
- name: context-keys-type
49+
- name: dot-imports
50+
- name: error-return
51+
- name: error-strings
52+
- name: error-naming
53+
- name: exported
54+
- name: increment-decrement
55+
- name: var-naming
56+
- name: var-declaration
57+
- name: package-comments
58+
- name: range
59+
- name: receiver-naming
60+
- name: time-naming
61+
- name: indent-error-flow
62+
- name: errorf
63+
- name: empty-block
64+
- name: superfluous-else
65+
- name: unused-parameter
66+
- name: unreachable-code
67+
- name: redefines-builtin-id
68+
- name: unexported-return
69+
exclusions:
70+
generated: lax
71+
presets:
72+
- comments
73+
- common-false-positives
74+
- legacy
75+
- std-error-handling
76+
rules:
77+
- linters:
78+
- revive
79+
path: mock(\w+)/doc.go$
80+
text: 'var-naming: don''t use an underscore in package name'
81+
- linters:
82+
- gosec
83+
path: pkg/eks/create.go$
84+
text: weak cryptographic primitive
85+
- linters:
86+
- gosec
87+
path: pkg/eks/create.go$
88+
text: TLS InsecureSkipVerify set true.
89+
- linters:
90+
- revive
91+
path: utils/
92+
text: 'var-naming: avoid meaningless package names'
93+
paths:
94+
- zz_generated_*
95+
- third_party$
96+
- builtin$
97+
- examples$
98+
formatters:
99+
enable:
100+
- gofmt
101+
- goimports
102+
exclusions:
103+
generated: lax
104+
paths:
105+
- zz_generated_*
106+
- third_party$
107+
- builtin$
108+
- examples$

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ GINKGO_VER := v2.28.1
3535
GINKGO_BIN := ginkgo
3636
GINKGO := $(BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
3737

38-
GO_APIDIFF_VER := v0.8.2
38+
GO_APIDIFF_VER := v0.8.3
3939
GO_APIDIFF_BIN := go-apidiff
4040
GO_APIDIFF := $(BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER)
4141

‎go.mod‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rancher/gke-operator
22

3-
go 1.24.0
3+
go 1.25.0
44

5-
toolchain go1.24.11
5+
toolchain go1.25.11
66

77
replace (
88
k8s.io/client-go => k8s.io/client-go v0.32.1
@@ -22,9 +22,9 @@ require (
2222
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e
2323
github.com/rancher/wrangler/v3 v3.2.0-rc.3
2424
github.com/sirupsen/logrus v1.9.4
25-
golang.org/x/net v0.49.0
25+
golang.org/x/net v0.55.0
2626
golang.org/x/oauth2 v0.35.0
27-
google.golang.org/api v0.221.0
27+
google.golang.org/api v0.252.0
2828
k8s.io/api v0.32.1
2929
k8s.io/apiextensions-apiserver v0.32.1
3030
k8s.io/apimachinery v0.32.1
@@ -35,9 +35,9 @@ require (
3535
)
3636

3737
require (
38-
cloud.google.com/go/auth v0.14.1 // indirect
39-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
40-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
38+
cloud.google.com/go/auth v0.17.0 // indirect
39+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
40+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
4141
github.com/beorn7/perks v1.0.1 // indirect
4242
github.com/blang/semver/v4 v4.0.0 // indirect
4343
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -63,8 +63,8 @@ require (
6363
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
6464
github.com/google/s2a-go v0.1.9 // indirect
6565
github.com/google/uuid v1.6.0 // indirect
66-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
67-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
66+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
67+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
6868
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6969
github.com/josharian/intern v1.0.0 // indirect
7070
github.com/json-iterator/go v1.1.12 // indirect
@@ -86,27 +86,27 @@ require (
8686
github.com/spf13/cobra v1.8.1 // indirect
8787
github.com/spf13/pflag v1.0.5 // indirect
8888
github.com/x448/float16 v0.8.4 // indirect
89-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
91-
go.opentelemetry.io/otel v1.34.0 // indirect
92-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
93-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
89+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
90+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
91+
go.opentelemetry.io/otel v1.41.0 // indirect
92+
go.opentelemetry.io/otel/metric v1.41.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.41.0 // indirect
9494
go.uber.org/multierr v1.11.0 // indirect
9595
go.uber.org/zap v1.27.0 // indirect
9696
go.yaml.in/yaml/v2 v2.4.2 // indirect
9797
go.yaml.in/yaml/v3 v3.0.4 // indirect
98-
golang.org/x/crypto v0.47.0 // indirect
99-
golang.org/x/mod v0.32.0 // indirect
100-
golang.org/x/sync v0.19.0 // indirect
101-
golang.org/x/sys v0.40.0 // indirect
102-
golang.org/x/term v0.39.0 // indirect
103-
golang.org/x/text v0.33.0 // indirect
104-
golang.org/x/time v0.10.0 // indirect
105-
golang.org/x/tools v0.41.0 // indirect
98+
golang.org/x/crypto v0.52.0 // indirect
99+
golang.org/x/mod v0.35.0 // indirect
100+
golang.org/x/sync v0.20.0 // indirect
101+
golang.org/x/sys v0.45.0 // indirect
102+
golang.org/x/term v0.43.0 // indirect
103+
golang.org/x/text v0.37.0 // indirect
104+
golang.org/x/time v0.13.0 // indirect
105+
golang.org/x/tools v0.44.0 // indirect
106106
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
107-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
108-
google.golang.org/grpc v1.70.0 // indirect
109-
google.golang.org/protobuf v1.36.7 // indirect
107+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
108+
google.golang.org/grpc v1.79.3 // indirect
109+
google.golang.org/protobuf v1.36.10 // indirect
110110
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)