Skip to content

Commit 8ddd088

Browse files
komer3komer3
committed
Update Go version to 1.24
- Updated Go version from 1.23.0 to 1.24.0 in go.mod and devbox files. - Removed kubernetes-controller-tools dependency from devbox.json and devbox.lock. Devbox was using older version causing issues. We can just use the binary we download using makefile target - Updated references to cluster-api addons API from experimental to stable in multiple files. This commit ensures compatibility with the latest Go version and cleans up unused dependencies, improving overall project maintainability.
1 parent aed374c commit 8ddd088

11 files changed

+43
-75
lines changed

‎cloud/scope/object_storage_key.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/linode/linodego"
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15-
clusteraddonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
15+
clusteraddonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
1616
"sigs.k8s.io/cluster-api/util/patch"
1717
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1818

‎cloud/scope/object_storage_key_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"k8s.io/apimachinery/pkg/runtime"
1717
"k8s.io/apimachinery/pkg/types"
1818
"k8s.io/utils/ptr"
19-
clusteraddonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
19+
clusteraddonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121

2222
infrav1alpha2 "github.com/linode/cluster-api-provider-linode/api/v1alpha2"

‎config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclusters.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@ spec:
6363
If ControlPlaneEndpoint is unset then the Nodebalancer ip will be used.
6464
properties:
6565
host:
66-
description: The hostname on which the API server is serving.
66+
description: host is the hostname on which the API server is serving.
67+
maxLength: 512
6768
type: string
6869
port:
69-
description: The port on which the API server is serving.
70+
description: port is the port on which the API server is serving.
7071
format: int32
7172
type: integer
7273
required:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_linodeclustertemplates.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ spec:
5757
If ControlPlaneEndpoint is unset then the Nodebalancer ip will be used.
5858
properties:
5959
host:
60-
description: The hostname on which the API server is serving.
60+
description: host is the hostname on which the API server
61+
is serving.
62+
maxLength: 512
6163
type: string
6264
port:
63-
description: The port on which the API server is serving.
65+
description: port is the port on which the API server
66+
is serving.
6467
format: int32
6568
type: integer
6669
required:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,19 @@ spec:
443443
address.
444444
properties:
445445
address:
446-
description: The machine address.
446+
description: address is the machine address.
447+
maxLength: 256
448+
minLength: 1
447449
type: string
448450
type:
449-
description: Machine address type, one of Hostname, ExternalIP,
450-
InternalIP, ExternalDNS or InternalDNS.
451+
description: type is the machine address type, one of Hostname,
452+
ExternalIP, InternalIP, ExternalDNS or InternalDNS.
453+
enum:
454+
- Hostname
455+
- ExternalIP
456+
- InternalIP
457+
- ExternalDNS
458+
- InternalDNS
451459
type: string
452460
required:
453461
- address

‎devbox.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
"ctlptl@latest",
55
"docker@latest",
66
"go-tools@latest",
7-
"go@1.23.0",
7+
"go@1.24",
88
"golangci-lint@latest",
99
"govulncheck@latest",
1010
"husky@latest",
1111
"kind@latest",
12-
"[email protected]",
1312
"kustomize@latest",
1413
"kuttl@latest",
1514
"nilaway@latest",

‎devbox.lock‎

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@
142142
}
143143
}
144144
},
145+
"github:NixOS/nixpkgs/nixpkgs-unstable": {
146+
"last_modified": "2025-04-13T09:22:33Z",
147+
"resolved": "github:NixOS/nixpkgs/18dd725c29603f582cf1900e0d25f9f1063dbf11?lastModified=1744536153&narHash=sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg%2FN38%3D"
148+
},
145149
"go-tools@latest": {
146150
"last_modified": "2024-10-13T23:44:06Z",
147151
"resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#go-tools",
@@ -189,51 +193,51 @@
189193
}
190194
}
191195
},
192-
"go@1.23.0": {
193-
"last_modified": "2024-08-31T10:12:23Z",
194-
"resolved": "github:NixOS/nixpkgs/5629520edecb69630a3f4d17d3d33fc96c13f6fe#go_1_23",
196+
"go@1.24": {
197+
"last_modified": "2025-03-11T17:52:14Z",
198+
"resolved": "github:NixOS/nixpkgs/0d534853a55b5d02a4ababa1d71921ce8f0aee4c#go",
195199
"source": "devbox-search",
196-
"version": "1.23.0",
200+
"version": "1.24.1",
197201
"systems": {
198202
"aarch64-darwin": {
199203
"outputs": [
200204
{
201205
"name": "out",
202-
"path": "/nix/store/4cijk6gwv59c84h1l9yhxzsaz93f67mz-go-1.23.0",
206+
"path": "/nix/store/ja4jxx60lh1qfqfl4z4p2rff56ia1c3c-go-1.24.1",
203207
"default": true
204208
}
205209
],
206-
"store_path": "/nix/store/4cijk6gwv59c84h1l9yhxzsaz93f67mz-go-1.23.0"
210+
"store_path": "/nix/store/ja4jxx60lh1qfqfl4z4p2rff56ia1c3c-go-1.24.1"
207211
},
208212
"aarch64-linux": {
209213
"outputs": [
210214
{
211215
"name": "out",
212-
"path": "/nix/store/mhwsyzk9v43q67ic34c02sxnsnbj7qbh-go-1.23.0",
216+
"path": "/nix/store/6zvrmsmdg7p8yw3vii20g40b4zsh6kjr-go-1.24.1",
213217
"default": true
214218
}
215219
],
216-
"store_path": "/nix/store/mhwsyzk9v43q67ic34c02sxnsnbj7qbh-go-1.23.0"
220+
"store_path": "/nix/store/6zvrmsmdg7p8yw3vii20g40b4zsh6kjr-go-1.24.1"
217221
},
218222
"x86_64-darwin": {
219223
"outputs": [
220224
{
221225
"name": "out",
222-
"path": "/nix/store/vbcqda38ha9gqsbwjw4q0swpwlvmnb1i-go-1.23.0",
226+
"path": "/nix/store/2bcic1xcha2k11djynr488v3pg0nnghr-go-1.24.1",
223227
"default": true
224228
}
225229
],
226-
"store_path": "/nix/store/vbcqda38ha9gqsbwjw4q0swpwlvmnb1i-go-1.23.0"
230+
"store_path": "/nix/store/2bcic1xcha2k11djynr488v3pg0nnghr-go-1.24.1"
227231
},
228232
"x86_64-linux": {
229233
"outputs": [
230234
{
231235
"name": "out",
232-
"path": "/nix/store/h5wkf711ql98c59n7yxa146jbjf9vrj5-go-1.23.0",
236+
"path": "/nix/store/g29rrn8qqlg4yjqv543ryrkimr7fk43h-go-1.24.1",
233237
"default": true
234238
}
235239
],
236-
"store_path": "/nix/store/h5wkf711ql98c59n7yxa146jbjf9vrj5-go-1.23.0"
240+
"store_path": "/nix/store/g29rrn8qqlg4yjqv543ryrkimr7fk43h-go-1.24.1"
237241
}
238242
}
239243
},
@@ -667,54 +671,6 @@
667671
}
668672
}
669673
},
670-
"[email protected]": {
671-
"last_modified": "2024-10-13T23:44:06Z",
672-
"resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#kubernetes-controller-tools",
673-
"source": "devbox-search",
674-
"version": "0.16.4",
675-
"systems": {
676-
"aarch64-darwin": {
677-
"outputs": [
678-
{
679-
"name": "out",
680-
"path": "/nix/store/amxl7nw7ihqi4d5q3pq325ifwff4i5kr-controller-tools-0.16.4",
681-
"default": true
682-
}
683-
],
684-
"store_path": "/nix/store/amxl7nw7ihqi4d5q3pq325ifwff4i5kr-controller-tools-0.16.4"
685-
},
686-
"aarch64-linux": {
687-
"outputs": [
688-
{
689-
"name": "out",
690-
"path": "/nix/store/cq1a87vmph94r4qya4l56bg47pzc21kr-controller-tools-0.16.4",
691-
"default": true
692-
}
693-
],
694-
"store_path": "/nix/store/cq1a87vmph94r4qya4l56bg47pzc21kr-controller-tools-0.16.4"
695-
},
696-
"x86_64-darwin": {
697-
"outputs": [
698-
{
699-
"name": "out",
700-
"path": "/nix/store/zcs66gmkvz2als5gyypbv76c96n70n59-controller-tools-0.16.4",
701-
"default": true
702-
}
703-
],
704-
"store_path": "/nix/store/zcs66gmkvz2als5gyypbv76c96n70n59-controller-tools-0.16.4"
705-
},
706-
"x86_64-linux": {
707-
"outputs": [
708-
{
709-
"name": "out",
710-
"path": "/nix/store/scbangqhifb3ncswbzbshp0pjc5a671s-controller-tools-0.16.4",
711-
"default": true
712-
}
713-
],
714-
"store_path": "/nix/store/scbangqhifb3ncswbzbshp0pjc5a671s-controller-tools-0.16.4"
715-
}
716-
}
717-
},
718674
"kubernetes-helm@latest": {
719675
"last_modified": "2024-10-13T23:44:06Z",
720676
"resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#kubernetes-helm",

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/linode/cluster-api-provider-linode
22

3-
go 1.23.0
3+
go 1.24.0
4+
45
toolchain go1.24.1
56

67
require (

‎internal/controller/linodeobjectstoragekey_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime/schema"
3030
"k8s.io/client-go/kubernetes/scheme"
3131
"k8s.io/utils/ptr"
32+
clusteraddonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
3233
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
33-
clusteraddonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
3434
conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
3535
"sigs.k8s.io/cluster-api/util/patch"
3636
"sigs.k8s.io/controller-runtime/pkg/client"

‎internal/webhook/v1alpha2/linodeobjectstoragekey_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/apimachinery/pkg/util/validation/field"
27-
clusteraddonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
27+
clusteraddonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
2828
ctrl "sigs.k8s.io/controller-runtime"
2929
logf "sigs.k8s.io/controller-runtime/pkg/log"
3030
"sigs.k8s.io/controller-runtime/pkg/webhook"

0 commit comments

Comments
 (0)