Skip to content

Commit a5c59b9

Browse files
josvazgjosvazg
authored
CLOUDP-346332: Bump Go to 1.25 solving all related issues (#2818)
* Bump go to version 1.25 * Fix mockery for go 1.25 as a go tool * Fix Nix bug in MacOS with conditional patch Signed-off-by: jose.vazquez <[email protected]> * Simpler Go 1.25 Nix support fix Signed-off-by: jose.vazquez <[email protected]> --------- Signed-off-by: jose.vazquez <[email protected]>
1 parent 9ff43ad commit a5c59b9

File tree

25 files changed

+186
-618
lines changed

25 files changed

+186
-618
lines changed

‎.github/actions/gen-install-scripts/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24
1+
FROM golang:1.25
22

33
ENV KUBECTL_VERSION 1.18.12
44
ENV KUSTOMIZE_VERSION 5.7.0

‎.github/workflows/clean.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v6
2222
with:
23-
go-version: '1.24'
23+
go-version: '1.25'
2424

2525
- name: CI checks
2626
working-directory: ./tools/clean

‎.github/workflows/compute-test-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v6
2222
with:
23-
go-version: '1.24'
23+
go-version: '1.25'
2424

2525
- name: CI checks
2626
working-directory: ./tools/compute-test-labels

‎.github/workflows/crd2go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go
2222
uses: actions/setup-go@v6
2323
with:
24-
go-version: '1.24'
24+
go-version: '1.25'
2525

2626
- name: CI checks
2727
working-directory: ./tools/crd2go

‎.github/workflows/githubjobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v6
2222
with:
23-
go-version: '1.24'
23+
go-version: '1.25'
2424

2525
- name: CI checks
2626
working-directory: ./tools/githubjobs

‎.github/workflows/makejwt.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v6
2222
with:
23-
go-version: '1.24'
23+
go-version: '1.25'
2424

2525
- name: CI checks
2626
working-directory: ./tools/makejwt

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ generate: ${GO_SOURCES} ## Generate code
286286
ifdef EXPERIMENTAL
287287
controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/v1/..."
288288
endif
289-
mockery
289+
go tool -modfile=tools/toolbox/go.mod mockery
290290
$(MAKE) fmt
291291

292292
.PHONY: check-missing-files

‎devbox.json‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
{
2-
"packages": [
3-
"yq-go@latest",
4-
"[email protected]",
5-
"jq@latest",
6-
"path:flakes/go",
7-
"gotests@latest",
8-
"act@latest",
9-
"kubectl@latest",
10-
"docker@latest",
11-
"[email protected]",
12-
"git@latest",
13-
"gettext@latest",
14-
"wget@latest",
15-
"cosign@latest",
16-
"kubernetes-helm@latest",
17-
"govulncheck@latest",
18-
"gotools@latest",
19-
"ginkgo@latest",
20-
"[email protected]",
21-
"shellcheck@latest",
22-
"golangci-lint@2",
23-
"[email protected]",
24-
"[email protected]",
25-
"awscli2@latest",
26-
"go-mockery@2",
27-
"docker-sbom@latest",
28-
"openshift@latest",
29-
"gh@latest",
30-
"addlicense@latest",
31-
"fd@latest"
32-
]
2+
"packages": {
3+
"yq-go": "latest",
4+
"kubebuilder": "4.1.1",
5+
"jq": "latest",
6+
"go": "latest",
7+
"gotests": "latest",
8+
"act": "latest",
9+
"kubectl": "latest",
10+
"docker": "latest",
11+
"kustomize": "4.3",
12+
"git": "latest",
13+
"gettext": "latest",
14+
"wget": "latest",
15+
"cosign": "latest",
16+
"kubernetes-helm": "latest",
17+
"govulncheck": "latest",
18+
"gotools": "latest",
19+
"ginkgo": "latest",
20+
"operator-sdk": "1.36.1",
21+
"shellcheck": "latest",
22+
"golangci-lint": "2",
23+
"kubernetes-controller-tools": "0.17.2",
24+
"setup-envtest": "0.19.0",
25+
"awscli2": "latest",
26+
"docker-sbom": "latest",
27+
"openshift": "latest",
28+
"gh": "latest",
29+
"addlicense": "latest",
30+
"fd": "latest",
31+
"apple-sdk_12": {
32+
"name": "sdk_12",
33+
"version": "latest",
34+
"platforms": ["aarch64-darwin", "x86_64-darwin"]
35+
}
36+
}
3337
}

‎devbox.lock‎

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,34 @@
9797
}
9898
}
9999
},
100+
"apple-sdk_12@latest": {
101+
"last_modified": "2025-10-07T08:41:47Z",
102+
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#apple-sdk_12",
103+
"source": "devbox-search",
104+
"version": "12.3",
105+
"systems": {
106+
"aarch64-darwin": {
107+
"outputs": [
108+
{
109+
"name": "out",
110+
"path": "/nix/store/7c89qp9s0z0hw6287ab0birhds66rwcb-apple-sdk-12.3",
111+
"default": true
112+
}
113+
],
114+
"store_path": "/nix/store/7c89qp9s0z0hw6287ab0birhds66rwcb-apple-sdk-12.3"
115+
},
116+
"x86_64-darwin": {
117+
"outputs": [
118+
{
119+
"name": "out",
120+
"path": "/nix/store/gqyvpax0b6dw5m02958ic8mdfd51fap7-apple-sdk-12.3",
121+
"default": true
122+
}
123+
],
124+
"store_path": "/nix/store/gqyvpax0b6dw5m02958ic8mdfd51fap7-apple-sdk-12.3"
125+
}
126+
}
127+
},
100128
"awscli2@latest": {
101129
"last_modified": "2025-10-10T13:35:32Z",
102130
"resolved": "github:NixOS/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65#awscli2",
@@ -354,8 +382,8 @@
354382
}
355383
},
356384
"gettext@latest": {
357-
"last_modified": "2025-10-07T08:41:47Z",
358-
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#gettext",
385+
"last_modified": "2025-10-11T06:31:15Z",
386+
"resolved": "github:NixOS/nixpkgs/362791944032cb532aabbeed7887a441496d5e6e#gettext",
359387
"source": "devbox-search",
360388
"version": "0.25.1",
361389
"systems": {
@@ -550,8 +578,8 @@
550578
}
551579
},
552580
"git@latest": {
553-
"last_modified": "2025-10-09T02:37:25Z",
554-
"resolved": "github:NixOS/nixpkgs/2dad7af78a183b6c486702c18af8a9544f298377#git",
581+
"last_modified": "2025-10-07T08:41:47Z",
582+
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#git",
555583
"source": "devbox-search",
556584
"version": "2.51.0",
557585
"systems": {
@@ -622,54 +650,54 @@
622650
}
623651
},
624652
"github:NixOS/nixpkgs/nixpkgs-unstable": {
625-
"last_modified": "2025-10-16T06:36:44Z",
626-
"resolved": "github:NixOS/nixpkgs/3cbe716e2346710d6e1f7c559363d14e11c32a43?lastModified=1760596604&narHash=sha256-J%2Fi5K6AAz%2Fy5dBePHQOuzC7MbhyTOKsd%2FGLezSbEFiM%3D"
653+
"last_modified": "2025-10-20T04:25:18Z",
654+
"resolved": "github:NixOS/nixpkgs/87848bf0cc4f87717fc813a4575f07330c3e743c?lastModified=1760934318&narHash=sha256-%2FoUYsC0lUCBory65VK%2BUHqCCsCspbL1Vgfcf1KUYqVw%3D"
627655
},
628-
"go-mockery@2": {
629-
"last_modified": "2025-07-13T22:45:35Z",
630-
"resolved": "github:NixOS/nixpkgs/a421ac6595024edcfbb1ef950a3712b89161c359#go-mockery",
656+
"go@latest": {
657+
"last_modified": "2025-10-07T08:41:47Z",
658+
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#go",
631659
"source": "devbox-search",
632-
"version": "2.53.3",
660+
"version": "1.25.1",
633661
"systems": {
634662
"aarch64-darwin": {
635663
"outputs": [
636664
{
637665
"name": "out",
638-
"path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3",
666+
"path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1",
639667
"default": true
640668
}
641669
],
642-
"store_path": "/nix/store/gymm44dbi3sp824ghj28z7xdp5y0z8ij-go-mockery-2.53.3"
670+
"store_path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1"
643671
},
644672
"aarch64-linux": {
645673
"outputs": [
646674
{
647675
"name": "out",
648-
"path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3",
676+
"path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1",
649677
"default": true
650678
}
651679
],
652-
"store_path": "/nix/store/7almddm7x5spkllll4avz0fd19slcvvj-go-mockery-2.53.3"
680+
"store_path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1"
653681
},
654682
"x86_64-darwin": {
655683
"outputs": [
656684
{
657685
"name": "out",
658-
"path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3",
686+
"path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1",
659687
"default": true
660688
}
661689
],
662-
"store_path": "/nix/store/xxd8ynzjqi4v0jahgzs9k45mj0ymcsns-go-mockery-2.53.3"
690+
"store_path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1"
663691
},
664692
"x86_64-linux": {
665693
"outputs": [
666694
{
667695
"name": "out",
668-
"path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3",
696+
"path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1",
669697
"default": true
670698
}
671699
],
672-
"store_path": "/nix/store/p7cdcd71qnf8k6h1fyrsx42a768w02c2-go-mockery-2.53.3"
700+
"store_path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1"
673701
}
674702
}
675703
},
@@ -866,8 +894,8 @@
866894
}
867895
},
868896
"jq@latest": {
869-
"last_modified": "2025-10-13T09:56:54Z",
870-
"resolved": "github:NixOS/nixpkgs/c12c63cd6c5eb34c7b4c3076c6a99e00fcab86ec#jq",
897+
"last_modified": "2025-10-12T08:13:11Z",
898+
"resolved": "github:NixOS/nixpkgs/832e3b6db48508ae436c2c7bfc0cf914eac6938e#jq",
871899
"source": "devbox-search",
872900
"version": "1.8.1",
873901
"systems": {
@@ -1222,14 +1250,6 @@
12221250
"default": true
12231251
}
12241252
]
1225-
},
1226-
"x86_64-linux": {
1227-
"outputs": [
1228-
{
1229-
"path": "/nix/store/cyxijsvrvl4v986z606yirrdk4pzcqj8-kustomize-4.3.0",
1230-
"default": true
1231-
}
1232-
]
12331253
}
12341254
}
12351255
},

‎fast.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# TODO: Eventually replace main Dockerfile
2-
FROM golang:1.24 AS certs-source
2+
FROM golang:1.25 AS certs-source
33
ARG GOTOOLCHAIN=auto
44

55
# Using rolling tag to stay on latest UBI 9

0 commit comments

Comments
 (0)