Skip to content

Commit 7d510f6

Browse files
authored
Merge pull request #50 from PDOK/basim/go-1.26-bump
go 1.26 bump
2 parents 69ab6ad + fb1fd89 commit 7d510f6

6 files changed

Lines changed: 217 additions & 248 deletions

File tree

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
- name: Run linter
2323
uses: golangci/golangci-lint-action@v9
2424
with:
25-
version: v2.7.2
25+
version: v2.9.0
2626
args: --timeout=5m

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ linters:
122122
path: _test\.go
123123
- linters:
124124
- cyclop
125+
- goconst
125126
path: (.+)_test\.go
126127
paths:
127128
- third_party$

api/v1/groupversion_info.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/scheme"
3333
)
3434

35+
//nolint:staticcheck
3536
var (
3637
// GroupVersion is group version used to register these objects.
3738
GroupVersion = schema.GroupVersion{Group: "pdok.nl", Version: "v1"}

go.mod

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,103 @@
11
module github.com/pdok/smooth-operator
22

3-
go 1.24.0
4-
5-
toolchain go1.24.2
6-
7-
godebug default=go1.23
3+
go 1.26.3
84

95
require (
106
github.com/google/go-cmp v0.7.0
117
github.com/pkg/errors v0.9.1
12-
github.com/stretchr/testify v1.10.0
13-
go.uber.org/zap v1.27.0
8+
github.com/stretchr/testify v1.11.1
9+
go.uber.org/zap v1.27.1
1410
gopkg.in/yaml.v3 v3.0.1
15-
k8s.io/api v0.32.3
16-
k8s.io/apiextensions-apiserver v0.32.3
17-
k8s.io/apimachinery v0.32.3
18-
k8s.io/apiserver v0.32.3
19-
k8s.io/client-go v0.32.3
20-
k8s.io/klog/v2 v2.130.1
21-
sigs.k8s.io/controller-runtime v0.20.4
11+
k8s.io/api v0.36.1
12+
k8s.io/apiextensions-apiserver v0.36.0
13+
k8s.io/apimachinery v0.36.1
14+
k8s.io/apiserver v0.36.0
15+
k8s.io/client-go v0.36.1
16+
k8s.io/klog/v2 v2.140.0
17+
sigs.k8s.io/controller-runtime v0.24.1
2218
sigs.k8s.io/kustomize/api v0.19.0
2319
sigs.k8s.io/kustomize/kyaml v0.19.0
24-
sigs.k8s.io/yaml v1.4.0
20+
sigs.k8s.io/yaml v1.6.0
2521
)
2622

2723
replace github.com/abbot/go-http-auth => github.com/abbot/go-http-auth v0.4.0 // for github.com/traefik/traefik/v2
2824

2925
require (
30-
cel.dev/expr v0.19.1 // indirect
26+
cel.dev/expr v0.25.1 // indirect
3127
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
32-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3328
github.com/beorn7/perks v1.0.1 // indirect
3429
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
30+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3631
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3732
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3934
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4035
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4136
github.com/felixge/httpsnoop v1.0.4 // indirect
42-
github.com/fsnotify/fsnotify v1.8.0 // indirect
43-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/fsnotify/fsnotify v1.9.0 // indirect
38+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4439
github.com/go-errors/errors v1.5.1 // indirect
45-
github.com/go-logr/logr v1.4.2 // indirect
40+
github.com/go-logr/logr v1.4.3 // indirect
4641
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/go-logr/zapr v1.3.0 // indirect
4842
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4943
github.com/go-openapi/jsonreference v0.21.0 // indirect
5044
github.com/go-openapi/swag v0.23.0 // indirect
5145
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/protobuf v1.5.4 // indirect
5346
github.com/google/btree v1.1.3 // indirect
54-
github.com/google/cel-go v0.22.1 // indirect
55-
github.com/google/gnostic-models v0.6.9 // indirect
56-
github.com/google/gofuzz v1.2.0 // indirect
47+
github.com/google/cel-go v0.26.0 // indirect
48+
github.com/google/gnostic-models v0.7.0 // indirect
5749
github.com/google/uuid v1.6.0 // indirect
58-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
50+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
5951
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6052
github.com/josharian/intern v1.0.0 // indirect
6153
github.com/json-iterator/go v1.1.12 // indirect
62-
github.com/klauspost/compress v1.17.11 // indirect
6354
github.com/mailru/easyjson v0.9.0 // indirect
6455
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
65-
github.com/modern-go/reflect2 v1.0.2 // indirect
56+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6657
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
67-
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
68-
github.com/onsi/gomega v1.36.2 // indirect
58+
github.com/onsi/ginkgo/v2 v2.27.4 // indirect
59+
github.com/onsi/gomega v1.39.0 // indirect
6960
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
70-
github.com/prometheus/client_golang v1.21.1 // indirect
71-
github.com/prometheus/client_model v0.6.1 // indirect
72-
github.com/prometheus/common v0.62.0 // indirect
73-
github.com/prometheus/procfs v0.15.1 // indirect
74-
github.com/spf13/cobra v1.9.1 // indirect
75-
github.com/spf13/pflag v1.0.6 // indirect
61+
github.com/prometheus/client_golang v1.23.2 // indirect
62+
github.com/prometheus/client_model v0.6.2 // indirect
63+
github.com/prometheus/common v0.67.5 // indirect
64+
github.com/prometheus/procfs v0.19.2 // indirect
65+
github.com/spf13/cobra v1.10.2 // indirect
66+
github.com/spf13/pflag v1.0.9 // indirect
7667
github.com/stoewer/go-strcase v1.3.0 // indirect
7768
github.com/x448/float16 v0.8.4 // indirect
78-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
79-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
80-
go.opentelemetry.io/otel v1.35.0 // indirect
81-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
82-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
83-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
84-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
85-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
86-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
69+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
71+
go.opentelemetry.io/otel v1.43.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
73+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
74+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
75+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
76+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
77+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
8778
go.uber.org/multierr v1.11.0 // indirect
88-
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
89-
golang.org/x/net v0.38.0 // indirect
90-
golang.org/x/oauth2 v0.28.0 // indirect
91-
golang.org/x/sync v0.12.0 // indirect
92-
golang.org/x/sys v0.31.0 // indirect
93-
golang.org/x/term v0.30.0 // indirect
94-
golang.org/x/text v0.23.0 // indirect
95-
golang.org/x/time v0.11.0 // indirect
96-
golang.org/x/tools v0.30.0 // indirect
79+
go.yaml.in/yaml/v2 v2.4.3 // indirect
80+
go.yaml.in/yaml/v3 v3.0.4 // indirect
81+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
82+
golang.org/x/net v0.52.0 // indirect
83+
golang.org/x/oauth2 v0.35.0 // indirect
84+
golang.org/x/sync v0.20.0 // indirect
85+
golang.org/x/sys v0.42.0 // indirect
86+
golang.org/x/term v0.41.0 // indirect
87+
golang.org/x/text v0.35.0 // indirect
88+
golang.org/x/time v0.14.0 // indirect
9789
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
98-
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
99-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
100-
google.golang.org/grpc v1.71.1 // indirect
101-
google.golang.org/protobuf v1.36.6 // indirect
102-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
90+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
92+
google.golang.org/grpc v1.80.0 // indirect
93+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
94+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
10395
gopkg.in/inf.v0 v0.9.1 // indirect
104-
k8s.io/component-base v0.32.3 // indirect
105-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
106-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
107-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
108-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
109-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
96+
k8s.io/component-base v0.36.1 // indirect
97+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
98+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
99+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
100+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
101+
sigs.k8s.io/randfill v1.0.0 // indirect
102+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
110103
)

0 commit comments

Comments
 (0)