Skip to content

Commit 32239c7

Browse files
komer3komer3
authored
Merge branch 'main' into ipv6-backend-support
2 parents a598b51 + f450e88 commit 32239c7

10 files changed

Lines changed: 143 additions & 128 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25-alpine AS builder
1+
FROM golang:1.26-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
@@ -37,7 +37,7 @@ CAAPH_VERSION ?= "v0.6.1"
3737
CAPL_VERSION ?= "v0.10.1"
3838

3939
# renovate: datasource=github-tags depName=golangci/golangci-lint
40-
GOLANGCI_LINT_VERSION ?= "v2.7.2"
40+
GOLANGCI_LINT_VERSION ?= "v2.11.3"
4141

4242
CONTROLPLANE_NODES ?= 1
4343
WORKER_NODES ?= 1

‎cloud/linode/fake_linode_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ func (f *fakeAPI) setupRoutes() {
552552
f.t.Fatal(err)
553553
}
554554

555-
subnets := []linodego.VPCSubnet{}
555+
subnets := make([]linodego.VPCSubnet, 0, len(vco.Subnets))
556556
for _, s := range vco.Subnets {
557557
subnet := linodego.VPCSubnet{
558558
ID: rand.Intn(9999),

‎cloud/linode/loadbalancers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3900,8 +3900,8 @@ func Test_getPortConfig(t *testing.T) {
39003900

39013901
if !reflect.DeepEqual(portConfigResult, test.expectedPortConfig) {
39023902
t.Error("unexpected port config")
3903-
t.Logf("expected: %q", test.expectedPortConfig)
3904-
t.Logf("actual: %q", portConfigResult)
3903+
t.Logf("expected: %#v", test.expectedPortConfig)
3904+
t.Logf("actual: %#v", portConfigResult)
39053905
}
39063906

39073907
if !reflect.DeepEqual(err, test.err) {

‎devbox.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"ctlptl@latest",
44
"docker@29.2.0",
55
"envsubst@latest",
6-
"go@1.25.1",
6+
"go@1.26.0",
77
"golangci-lint@2.4.0",
88
"jq@latest",
99
"kind@latest",
@@ -27,6 +27,7 @@
2727
}
2828
},
2929
"env": {
30-
"EXP_CLUSTER_RESOURCE_SET": "true"
30+
"EXP_CLUSTER_RESOURCE_SET": "true",
31+
"GOTOOLCHAIN": "auto"
3132
}
3233
}

‎devbox.lock‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -194,53 +194,54 @@
194194
}
195195
},
196196
"github:NixOS/nixpkgs/nixpkgs-unstable": {
197-
"resolved": "github:NixOS/nixpkgs/e0042dedfbc9134ef973f64e5c7f56a38cc5cc97?lastModified=1748344075&narHash=sha256-PsZAY3H0e%2FPBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU%3D"
197+
"last_modified": "2026-03-10T02:35:18Z",
198+
"resolved": "github:NixOS/nixpkgs/e607cb5360ff1234862ac9f8839522becb853bb9?lastModified=1773110118&narHash=sha256-mPAG8phMbCReKSiKAijjjd3v7uVcJOQ75gSjGJjt%2FRk%3D"
198199
},
199-
"go@1.25.1": {
200-
"last_modified": "2025-10-07T08:41:47Z",
201-
"resolved": "github:NixOS/nixpkgs/bce5fe2bb998488d8e7e7856315f90496723793c#go",
200+
"go@1.26.0": {
201+
"last_modified": "2026-02-23T15:40:43Z",
202+
"resolved": "github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#go_1_26",
202203
"source": "devbox-search",
203-
"version": "1.25.1",
204+
"version": "1.26.0",
204205
"systems": {
205206
"aarch64-darwin": {
206207
"outputs": [
207208
{
208209
"name": "out",
209-
"path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1",
210+
"path": "/nix/store/5ajixjk279m40yf6x96xxlnvw1wg6hq3-go-1.26.0",
210211
"default": true
211212
}
212213
],
213-
"store_path": "/nix/store/mkdfnr1nkfj2kznxyag9pypbxp3wqqdv-go-1.25.1"
214+
"store_path": "/nix/store/5ajixjk279m40yf6x96xxlnvw1wg6hq3-go-1.26.0"
214215
},
215216
"aarch64-linux": {
216217
"outputs": [
217218
{
218219
"name": "out",
219-
"path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1",
220+
"path": "/nix/store/b0ncnyjis5pfzm86pb0y3klgdw2gwyww-go-1.26.0",
220221
"default": true
221222
}
222223
],
223-
"store_path": "/nix/store/0jzj8p7k9wkr4l17sgrlg3z5di27sggf-go-1.25.1"
224+
"store_path": "/nix/store/b0ncnyjis5pfzm86pb0y3klgdw2gwyww-go-1.26.0"
224225
},
225226
"x86_64-darwin": {
226227
"outputs": [
227228
{
228229
"name": "out",
229-
"path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1",
230+
"path": "/nix/store/kpr6dqdjixi0b1wh7phisqmzkxjw7ln7-go-1.26.0",
230231
"default": true
231232
}
232233
],
233-
"store_path": "/nix/store/q2xylk8h3kbfajhw2lpdmyzyyqgqx8fl-go-1.25.1"
234+
"store_path": "/nix/store/kpr6dqdjixi0b1wh7phisqmzkxjw7ln7-go-1.26.0"
234235
},
235236
"x86_64-linux": {
236237
"outputs": [
237238
{
238239
"name": "out",
239-
"path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1",
240+
"path": "/nix/store/s9dwyyi8mk76wslsm6jl50ky9hd11pv3-go-1.26.0",
240241
"default": true
241242
}
242243
],
243-
"store_path": "/nix/store/f01qkydd3c2jqwi4w6hkddkf3blp16kw-go-1.25.1"
244+
"store_path": "/nix/store/s9dwyyi8mk76wslsm6jl50ky9hd11pv3-go-1.26.0"
244245
}
245246
}
246247
},

‎e2e/test/lb-created-with-unreserved-ip/chainsaw-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Test
44
metadata:
55
name: lb-created-with-unreserved-ip
66
labels:
7-
all:
7+
# all: # Excluded from all until this stops flaking
88
lke:
99
spec:
1010
namespace: "lb-created-with-unreserved-ip"

‎go.mod‎

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

3-
go 1.25.0
4-
5-
toolchain go1.25.5
3+
go 1.26.1
64

75
require (
86
github.com/appscode/go v0.0.0-20201105063637-5613f3b8169f
97
github.com/cilium/cilium v1.18.6
10-
github.com/getsentry/sentry-go v0.42.0
8+
github.com/getsentry/sentry-go v0.43.0
119
github.com/golang/mock v1.6.0
1210
github.com/google/uuid v1.6.0
1311
github.com/hexdigest/gowrap v1.4.3
@@ -16,22 +14,22 @@ require (
1614
github.com/spf13/pflag v1.0.10
1715
github.com/stretchr/testify v1.11.1
1816
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa
19-
k8s.io/api v0.34.1
20-
k8s.io/apimachinery v0.34.1
21-
k8s.io/client-go v0.34.1
22-
k8s.io/cloud-provider v0.34.1
23-
k8s.io/component-base v0.34.1
24-
k8s.io/component-helpers v0.34.1
25-
k8s.io/klog/v2 v2.130.1
26-
k8s.io/kubernetes v1.34.2
27-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
17+
k8s.io/api v0.35.2
18+
k8s.io/apimachinery v0.35.2
19+
k8s.io/client-go v0.35.2
20+
k8s.io/cloud-provider v0.35.2
21+
k8s.io/component-base v0.35.2
22+
k8s.io/component-helpers v0.35.2
23+
k8s.io/klog/v2 v2.140.0
24+
k8s.io/kubernetes v1.35.2
25+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
2826
)
2927

3028
require (
3129
cel.dev/expr v0.24.0 // indirect
3230
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3331
github.com/Masterminds/goutils v1.1.1 // indirect
34-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
32+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3533
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
3634
github.com/NYTimes/gziphandler v1.1.1 // indirect
3735
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -95,7 +93,7 @@ require (
9593
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
9694
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9795
github.com/oklog/ulid v1.3.1 // indirect
98-
github.com/onsi/gomega v1.36.1 // indirect
96+
github.com/onsi/gomega v1.38.2 // indirect
9997
github.com/opencontainers/go-digest v1.0.0 // indirect
10098
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
10199
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -105,26 +103,27 @@ require (
105103
github.com/prometheus/client_model v0.6.2 // indirect
106104
github.com/prometheus/common v0.66.1 // indirect
107105
github.com/prometheus/procfs v0.17.0 // indirect
106+
github.com/robfig/cron/v3 v3.0.1 // indirect
108107
github.com/sagikazarmark/locafero v0.7.0 // indirect
109108
github.com/sasha-s/go-deadlock v0.3.5 // indirect
110109
github.com/shopspring/decimal v1.2.0 // indirect
111110
github.com/sourcegraph/conc v0.3.0 // indirect
112111
github.com/spf13/afero v1.14.0 // indirect
113112
github.com/spf13/cast v1.9.2 // indirect
114-
github.com/spf13/cobra v1.9.1 // indirect
113+
github.com/spf13/cobra v1.10.0 // indirect
115114
github.com/spf13/viper v1.20.1 // indirect
116115
github.com/stoewer/go-strcase v1.3.0 // indirect
117116
github.com/subosito/gotenv v1.6.0 // indirect
118117
github.com/vishvananda/netlink v1.3.1 // indirect
119118
github.com/vishvananda/netns v0.0.5 // indirect
120119
github.com/x448/float16 v0.8.4 // indirect
121-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
122-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
123-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
120+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
121+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
122+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
124123
go.mongodb.org/mongo-driver v1.14.0 // indirect
125124
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
126125
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
127-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
126+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
128127
go.opentelemetry.io/otel v1.40.0 // indirect
129128
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
130129
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
@@ -135,7 +134,7 @@ require (
135134
go.uber.org/dig v1.17.1 // indirect
136135
go.uber.org/multierr v1.11.0 // indirect
137136
go.uber.org/zap v1.27.0 // indirect
138-
go.yaml.in/yaml/v2 v2.4.2 // indirect
137+
go.yaml.in/yaml/v2 v2.4.3 // indirect
139138
go.yaml.in/yaml/v3 v3.0.4 // indirect
140139
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
141140
golang.org/x/crypto v0.48.0 // indirect
@@ -152,39 +151,39 @@ require (
152151
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
153152
google.golang.org/grpc v1.74.2 // indirect
154153
google.golang.org/protobuf v1.36.8 // indirect
155-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
154+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
156155
gopkg.in/inf.v0 v0.9.1 // indirect
157156
gopkg.in/ini.v1 v1.67.0 // indirect
158157
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
159158
gopkg.in/yaml.v3 v3.0.1 // indirect
160-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
161-
k8s.io/apiserver v0.34.1 // indirect
162-
k8s.io/controller-manager v0.34.1 // indirect
163-
k8s.io/kms v0.34.1 // indirect
164-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
159+
k8s.io/apiextensions-apiserver v0.35.2 // indirect
160+
k8s.io/apiserver v0.35.2 // indirect
161+
k8s.io/controller-manager v0.35.2 // indirect
162+
k8s.io/kms v0.35.2 // indirect
163+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
165164
k8s.io/kubelet v0.0.0 // indirect
166165
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
167-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
166+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
168167
sigs.k8s.io/randfill v1.0.0 // indirect
169168
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
170169
sigs.k8s.io/yaml v1.6.0 // indirect
171170
)
172171

173172
replace (
174173
github.com/linode/linodego => github.com/linode/linodego v1.64.1-0.20260110062643-8a0a88cf96c9
175-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.1
176-
k8s.io/cri-api => k8s.io/cri-api v0.34.1
177-
k8s.io/cri-client => k8s.io/cri-client v0.34.1
178-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.1
179-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.1
180-
k8s.io/externaljwt => k8s.io/externaljwt v0.34.1
181-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.1
182-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.1
183-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.1
184-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.1
185-
k8s.io/kubelet => k8s.io/kubelet v0.34.1
186-
k8s.io/metrics => k8s.io/metrics v0.34.1
187-
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
188-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.1
189-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.1
174+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.2
175+
k8s.io/cri-api => k8s.io/cri-api v0.35.2
176+
k8s.io/cri-client => k8s.io/cri-client v0.35.2
177+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.35.2
178+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.35.2
179+
k8s.io/externaljwt => k8s.io/externaljwt v0.35.2
180+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.2
181+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.2
182+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.2
183+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.2
184+
k8s.io/kubelet => k8s.io/kubelet v0.35.2
185+
k8s.io/metrics => k8s.io/metrics v0.35.2
186+
k8s.io/mount-utils => k8s.io/mount-utils v0.35.2
187+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.35.2
188+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.2
190189
)

0 commit comments

Comments
 (0)