Skip to content

Commit 4ea2fa8

Browse files
fix(lint): fix modernize linter issues
Update Go version to 1.26 in .golangci.yml to resolve modernize linter errors that appeared after Go 1.26.0 upgrade.
1 parent 4d7e333 commit 4ea2fa8

5 files changed

Lines changed: 15 additions & 23 deletions

File tree

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.25"
3+
go: "1.26"
44
timeout: 10m
55
modules-download-mode: readonly
66
allow-parallel-runners: true

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ require (
2121
k8s.io/code-generator v0.36.0
2222
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b
2323
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
24-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
2524
sigs.k8s.io/yaml v1.6.0
2625
)
2726

@@ -91,6 +90,7 @@ require (
9190
k8s.io/client-go v0.36.0 // indirect
9291
k8s.io/component-base v0.36.0 // indirect
9392
k8s.io/klog/v2 v2.140.0 // indirect
93+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
9494
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
9595
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
9696
sigs.k8s.io/randfill v1.0.0 // indirect

pkg/applyconfiguration/testdata/cronjob/api/v1/applyconfiguration/internal/internal.go

Lines changed: 9 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/crd/known_types.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"maps"
2121

2222
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
23-
"k8s.io/utils/ptr"
2423
"sigs.k8s.io/controller-tools/pkg/loader"
2524
)
2625

@@ -69,7 +68,7 @@ var KnownPackages = map[string]PackageOverride{
6968
p.Schemata[TypeIdent{Name: "RawExtension", Package: pkg}] = apiextensionsv1.JSONSchemaProps{
7069
// TODO(directxman12): regexp validation for this (or get kube to support it as a format value)
7170
Type: "object",
72-
XPreserveUnknownFields: ptr.To(true),
71+
XPreserveUnknownFields: new(true),
7372
}
7473
p.AddPackage(pkg) // get the rest of the types
7574
},
@@ -94,13 +93,13 @@ var KnownPackages = map[string]PackageOverride{
9493

9594
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1": func(p *Parser, pkg *loader.Package) {
9695
p.Schemata[TypeIdent{Name: "JSON", Package: pkg}] = apiextensionsv1.JSONSchemaProps{
97-
XPreserveUnknownFields: ptr.To(true),
96+
XPreserveUnknownFields: new(true),
9897
}
9998
p.AddPackage(pkg) // get the rest of the types
10099
},
101100
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1": func(p *Parser, pkg *loader.Package) {
102101
p.Schemata[TypeIdent{Name: "JSON", Package: pkg}] = apiextensionsv1.JSONSchemaProps{
103-
XPreserveUnknownFields: ptr.To(true),
102+
XPreserveUnknownFields: new(true),
104103
}
105104
p.AddPackage(pkg) // get the rest of the types
106105
},

pkg/markers/parse.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,7 @@ func (d *Definition) loadFields() error {
781781
return nil
782782
}
783783

784-
for i := 0; i < d.Output.NumField(); i++ {
785-
field := d.Output.Field(i)
784+
for field := range d.Output.Fields() {
786785
if field.PkgPath != "" {
787786
// as per the reflect package docs, pkgpath is empty for exported fields,
788787
// so non-empty package path means a private field, which we should skip

0 commit comments

Comments
 (0)