Skip to content

Commit 52dbb71

Browse files
Merge pull request #483 from linode/go-1.25-upgrade
[deps] bump go to 1.25
2 parents 39487fe + cffd21a commit 52dbb71

File tree

6 files changed

+30
-32
lines changed

6 files changed

+30
-32
lines changed

.github/workflows/build-test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ jobs:
7474

7575
- name: lint
7676
uses: golangci/golangci-lint-action@v8
77-
with:
78-
version: v2.1.5
7977

8078
- name: Helm Lint
8179
run: make helm-lint

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-alpine AS builder
1+
FROM golang:1.25-alpine AS builder
22
RUN mkdir -p /linode
33
WORKDIR /linode
44

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ LINODE_URL ?= https://api.linode.com
3131
KUBECONFIG_PATH ?= $(CURDIR)/test-cluster-kubeconfig.yaml
3232
SUBNET_KUBECONFIG_PATH ?= $(CURDIR)/subnet-testing-kubeconfig.yaml
3333
MGMT_KUBECONFIG_PATH ?= $(CURDIR)/mgmt-cluster-kubeconfig.yaml
34-
GOLANGCI_LINT_VERSION ?= v2.1.5
34+
GOLANGCI_LINT_VERSION ?= v2.5.0
3535

3636
# if the $DEVBOX_PACKAGES_DIR env variable exists that means we are within a devbox shell and can safely
3737
# use devbox's bin for our tools

devbox.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"clusterctl@latest",
55
"docker@latest",
66
"envsubst@latest",
7-
"go@1.24.1",
8-
"golangci-lint@latest",
7+
"go@1.25.1",
8+
"golangci-lint@2.4.0",
99
"jq@latest",
1010
"kind@latest",
1111
"kubectl@latest",

devbox.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -196,99 +196,99 @@
196196
"github:NixOS/nixpkgs/nixpkgs-unstable": {
197197
"resolved": "github:NixOS/nixpkgs/e0042dedfbc9134ef973f64e5c7f56a38cc5cc97?lastModified=1748344075&narHash=sha256-PsZAY3H0e%2FPBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU%3D"
198198
},
199-
"go@1.24.1": {
200-
"last_modified": "2025-03-23T05:31:05Z",
201-
"resolved": "github:NixOS/nixpkgs/dd613136ee91f67e5dba3f3f41ac99ae89c5406b#go",
199+
"go@1.25.1": {
200+
"last_modified": "2025-10-07T08:41:47Z",
201+
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#go",
202202
"source": "devbox-search",
203-
"version": "1.24.1",
203+
"version": "1.25.1",
204204
"systems": {
205205
"aarch64-darwin": {
206206
"outputs": [
207207
{
208208
"name": "out",
209-
"path": "/nix/store/ja4jxx60lh1qfqfl4z4p2rff56ia1c3c-go-1.24.1",
209+
"path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1",
210210
"default": true
211211
}
212212
],
213-
"store_path": "/nix/store/ja4jxx60lh1qfqfl4z4p2rff56ia1c3c-go-1.24.1"
213+
"store_path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1"
214214
},
215215
"aarch64-linux": {
216216
"outputs": [
217217
{
218218
"name": "out",
219-
"path": "/nix/store/6zvrmsmdg7p8yw3vii20g40b4zsh6kjr-go-1.24.1",
219+
"path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1",
220220
"default": true
221221
}
222222
],
223-
"store_path": "/nix/store/6zvrmsmdg7p8yw3vii20g40b4zsh6kjr-go-1.24.1"
223+
"store_path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1"
224224
},
225225
"x86_64-darwin": {
226226
"outputs": [
227227
{
228228
"name": "out",
229-
"path": "/nix/store/2bcic1xcha2k11djynr488v3pg0nnghr-go-1.24.1",
229+
"path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1",
230230
"default": true
231231
}
232232
],
233-
"store_path": "/nix/store/2bcic1xcha2k11djynr488v3pg0nnghr-go-1.24.1"
233+
"store_path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1"
234234
},
235235
"x86_64-linux": {
236236
"outputs": [
237237
{
238238
"name": "out",
239-
"path": "/nix/store/g29rrn8qqlg4yjqv543ryrkimr7fk43h-go-1.24.1",
239+
"path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1",
240240
"default": true
241241
}
242242
],
243-
"store_path": "/nix/store/g29rrn8qqlg4yjqv543ryrkimr7fk43h-go-1.24.1"
243+
"store_path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1"
244244
}
245245
}
246246
},
247-
"golangci-lint@latest": {
248-
"last_modified": "2025-05-16T20:19:48Z",
249-
"resolved": "github:NixOS/nixpkgs/12a55407652e04dcf2309436eb06fef0d3713ef3#golangci-lint",
247+
"golangci-lint@2.4.0": {
248+
"last_modified": "2025-09-18T16:33:27Z",
249+
"resolved": "github:NixOS/nixpkgs/f4b140d5b253f5e2a1ff4e5506edbf8267724bde#golangci-lint",
250250
"source": "devbox-search",
251-
"version": "2.1.6",
251+
"version": "2.4.0",
252252
"systems": {
253253
"aarch64-darwin": {
254254
"outputs": [
255255
{
256256
"name": "out",
257-
"path": "/nix/store/8d3n5ly5r6prqyx3h5nr2v778hzwp83r-golangci-lint-2.1.6",
257+
"path": "/nix/store/2iiw320mwgw7flh47zbz6l62fakrb3dx-golangci-lint-2.4.0",
258258
"default": true
259259
}
260260
],
261-
"store_path": "/nix/store/8d3n5ly5r6prqyx3h5nr2v778hzwp83r-golangci-lint-2.1.6"
261+
"store_path": "/nix/store/2iiw320mwgw7flh47zbz6l62fakrb3dx-golangci-lint-2.4.0"
262262
},
263263
"aarch64-linux": {
264264
"outputs": [
265265
{
266266
"name": "out",
267-
"path": "/nix/store/sazvkjsaxnpnplrsaj5wf1x9xkgv0s88-golangci-lint-2.1.6",
267+
"path": "/nix/store/hwr3wdhqnlcay07xpgv2wm1mx7k5nkhf-golangci-lint-2.4.0",
268268
"default": true
269269
}
270270
],
271-
"store_path": "/nix/store/sazvkjsaxnpnplrsaj5wf1x9xkgv0s88-golangci-lint-2.1.6"
271+
"store_path": "/nix/store/hwr3wdhqnlcay07xpgv2wm1mx7k5nkhf-golangci-lint-2.4.0"
272272
},
273273
"x86_64-darwin": {
274274
"outputs": [
275275
{
276276
"name": "out",
277-
"path": "/nix/store/cqfnavdyysfdm9cam8bsyscbsk8zg781-golangci-lint-2.1.6",
277+
"path": "/nix/store/skcc363l41rm6hjyrhzlfbk3rrwci2lb-golangci-lint-2.4.0",
278278
"default": true
279279
}
280280
],
281-
"store_path": "/nix/store/cqfnavdyysfdm9cam8bsyscbsk8zg781-golangci-lint-2.1.6"
281+
"store_path": "/nix/store/skcc363l41rm6hjyrhzlfbk3rrwci2lb-golangci-lint-2.4.0"
282282
},
283283
"x86_64-linux": {
284284
"outputs": [
285285
{
286286
"name": "out",
287-
"path": "/nix/store/snqg2xccy7fb6q6n2dw3bfql6mqbh6ar-golangci-lint-2.1.6",
287+
"path": "/nix/store/dlz6z4dih7rd6q9dnigvz49npfmv8m52-golangci-lint-2.4.0",
288288
"default": true
289289
}
290290
],
291-
"store_path": "/nix/store/snqg2xccy7fb6q6n2dw3bfql6mqbh6ar-golangci-lint-2.1.6"
291+
"store_path": "/nix/store/dlz6z4dih7rd6q9dnigvz49npfmv8m52-golangci-lint-2.4.0"
292292
}
293293
}
294294
},

go.mod

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

3-
go 1.24.0
3+
go 1.25.0
44

5-
toolchain go1.24.1
5+
toolchain go1.25.3
66

77
require (
88
github.com/appscode/go v0.0.0-20201105063637-5613f3b8169f

0 commit comments

Comments
 (0)