Bump golangci-lint to match go 1.25

Author: pacevedom

.golangci.yaml

@@ -34,6 +34,8 @@ linters:
     - nlreturn
     # Replaced by whitespace.
     - wsl
+    # We do not enforce godoc comments.
+    - godoclint
   # https://golangci-lint.run/usage/linters/
   enable:
   - asasalint
@@ -107,6 +109,14 @@ linters:
         text: 'G301: Expect directory permissions to be 0750 or less'
       - path: 'pkg/components/storage\.go'
         text: 'G302: Expect file permissions to be 0600 or less'
+      - path: 'pkg/config/node\.go'
+        text: 'G703: Path traversal via taint analysis'
+      - path: 'pkg/controllers/kube-apiserver\.go'
+        text: 'G703: Path traversal via taint analysis'
+      - path: 'pkg/telemetry/telemetry\.go'
+        text: 'G704: SSRF via taint analysis'
+      - path: 'pkg/util/cryptomaterial/certchains/signers\.go'
+        text: 'toBuilder returns interface'
   settings:
     cyclop:
       max-complexity: 20

cmd/generate-config/util.go

@@ -145,7 +145,7 @@ func parseJSONValue(jsonType interface{}) (value string, node []*yaml.Node) {
 }
 
 func schemaKeyToOrderedArray[K string | int, V any](schemaProperties map[K]V) []K {
-	var ordered = []K{}
+	var ordered = make([]K, 0, len(schemaProperties))
 	for k := range schemaProperties {
 		ordered = append(ordered, k)
 	}

pkg/assets/unstructured.go

@@ -52,14 +52,6 @@ var configClientCache = make(map[string]configClientCacheEntry, 1)
 var configClientCacheLock sync.RWMutex
 
 type unstructuredClient struct {
-	base   dynamic.Interface
-	mapper meta.ResettableRESTMapper
-
-	Client    dynamic.ResourceInterface
-	Discovery discovery.AggregatedDiscoveryInterface
-
-	unstructured *unstructured.Unstructured
-
 	// modify is a function that modifies the existing object based on the required object.
 	// The first argument is a pointer to a boolean that should be set to true if the object was modified.
 	// i.e. `*modified = true`
@@ -68,6 +60,14 @@ type unstructuredClient struct {
 	// If Not set, the object will only have its metadata fields updated.
 	// If set, the object will be modified based on the function.
 	ModifyOnExists
+
+	base   dynamic.Interface
+	mapper meta.ResettableRESTMapper
+
+	Client    dynamic.ResourceInterface
+	Discovery discovery.AggregatedDiscoveryInterface
+
+	unstructured *unstructured.Unstructured
 }
 
 func unstructuredConfigAndClient(kubeconfigPath string) (configClientCacheEntry, error) {

pkg/cmd/showConfig.go

@@ -12,8 +12,9 @@ import (
 )
 
 type showConfigOptions struct {
-	Mode string
 	genericclioptions.IOStreams
+
+	Mode string
 }
 
 func NewShowConfigCommand(ioStreams genericclioptions.IOStreams) *cobra.Command {

pkg/cmd/version.go

@@ -14,9 +14,9 @@ import (
 )
 
 type VersionOptions struct {
-	Output string
-
 	genericclioptions.IOStreams
+
+	Output string
 }
 
 func NewVersionOptions(ioStreams genericclioptions.IOStreams) *VersionOptions {

pkg/components/controllers.go

@@ -349,7 +349,7 @@ func startDNSController(ctx context.Context, cfg *config.Config, kubeconfigPath
 // type list. Also quote/escape any characters that are special to HAProxy (\,', and ").
 // See http://cbonte.github.io/haproxy-dconv/2.2/configuration.html#2.2
 func getMIMETypes(mimeTypes []operatorv1.CompressionMIMEType) []string {
-	mimes := []string{}
+	mimes := make([]string, 0, len(mimeTypes))
 
 	for _, m := range mimeTypes {
 		mimeType := string(m)

pkg/healthcheck/debug_info.go

@@ -129,6 +129,7 @@ type unpulledImage struct {
 
 type failedImage struct {
 	unpulledImage
+
 	Message string
 }
 

pkg/mdns/controller.go

@@ -16,6 +16,7 @@ import (
 
 type MicroShiftmDNSController struct {
 	sync.Mutex
+
 	NodeName   string
 	NodeIP     string
 	KubeConfig string
@@ -127,7 +128,7 @@ func ipInAddrs(ip string, addrs []net.Addr) bool {
 }
 
 func addrsToStrings(addrs []net.Addr) []string {
-	var ipAddrs = make([]string, 0)
+	var ipAddrs = make([]string, 0, len(addrs))
 
 	for _, a := range addrs {
 		ipAddr, _, _ := net.ParseCIDR(a.String())

pkg/mdns/server/resolver.go

@@ -26,6 +26,7 @@ const defaultTTL = 120
 
 type Resolver struct {
 	sync.Mutex
+
 	domain map[string][]net.IP
 }
 
@@ -38,7 +39,7 @@ func NewResolver() *Resolver {
 func (r *Resolver) AddDomain(name string, ipStrs []string) {
 	r.Lock()
 	defer r.Unlock()
-	var ips = make([]net.IP, 0)
+	var ips = make([]net.IP, 0, len(ipStrs))
 
 	for _, ip := range ipStrs {
 		ips = append(ips, net.ParseIP(ip))

pkg/servicemanager/manager.go

@@ -78,7 +78,7 @@ func (m *ServiceManager) Run(ctx context.Context, ready chan<- struct{}, stopped
 
 	for _, service := range services {
 		// Compile a list of ready channels of the service's dependencies (if any).
-		depsReadyList := []<-chan struct{}{}
+		depsReadyList := make([]<-chan struct{}, 0, len(service.Dependencies()))
 		for _, dependency := range service.Dependencies() {
 			depsReadyList = append(depsReadyList, readyMap[dependency])
 		}