Update golangci-lint and re-enable CI linting step

.github/workflows/validate.yaml

@@ -0,0 +1,63 @@
+name: Validate
+on:
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - "channel.yaml"
+      - "install.sh"
+      - "tests/**"
+      - "!tests/e2e**"
+      - "!tests/docker**"
+      - ".github/**"
+      - "!.github/actions/**"
+      - "!.github/workflows/validate.yaml"
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    name: Validate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: ${{ github.event.pull_request.commits }}
+
+      - name: Set Go Version
+        run: |
+          source ./scripts/version.sh
+          {
+            echo "GOTOOLCHAIN=${VERSION_GOLANG/go}"
+          } >> "$GITHUB_ENV"
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: "${{ env.GOTOOLCHAIN }}"
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.7
+          args: "--new-from-merge-base ${{ github.event.pull_request.base.sha }}"
+
+      - name: Lint (windows)
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.7
+          args: "--new-from-merge-base ${{ github.event.pull_request.base.sha }} ./pkg/... ./cmd/..."
+        env:
+          GOOS: "windows"
+
+      - name: Validate
+        run: ./scripts/validate
+        env:
+          SKIP_LINT: "true"
+
+      - name: Validate (windows)
+        run: ./scripts/validate
+        env:
+          SKIP_LINT: "true"
+          GOOS: "windows"

.golangci.yml

@@ -0,0 +1,56 @@
+issues:
+  max-issues-per-linter: 1000
+  max-same-issues: 100
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+linters:
+  default: none
+  enable:
+    - govet
+    - revive
+  settings:
+    revive:
+      enable-all-rules: true
+      rules:
+        - {name: add-constant, disabled: true}
+        - {name: argument-limit, disabled: true}
+        - {name: cognitive-complexity, disabled: true}
+        - {name: confusing-naming, disabled: true}
+        - {name: confusing-results, disabled: true}
+        - {name: cyclomatic, disabled: true}
+        - {name: early-return, disabled: true}
+        - {name: empty-block, disabled: true}
+        - {name: enforce-switch-style, disabled: true}
+        - {name: flag-parameter, disabled: true}
+        - {name: function-length, disabled: true}
+        - {name: function-result-limit, disabled: true}
+        - {name: import-shadowing, disabled: true}
+        - {name: line-length-limit, disabled: true}
+        - {name: max-control-nesting, disabled: true}
+        - {name: max-public-structs, disabled: true}
+        - {name: redundant-import-alias, disabled: true}
+        - {name: unsecure-url-scheme, disabled: true}
+        - {name: unused-parameter, disabled: true}
+        - {name: unused-receiver, disabled: true}
+        - {name: var-naming, disabled: true}
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - tests/
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+version: "2"

Dockerfile.dapper

@@ -28,14 +28,14 @@ RUN case "$(go env GOARCH)" in \
     fi
 
 # Install goimports
-RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.16.0
+RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.20.0
 
 # Cleanup
 RUN rm -rf /go/src /go/pkg
 
 # Install golangci-lint for amd64
 RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
-    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2;  \
+    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/refs/tags/v2.7.2/install.sh | sh -s -- v2.7.2; \
     fi
 
 # Set SELINUX environment variable

Dockerfile.local

@@ -11,11 +11,11 @@ RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget c
     fi
 
 # Install goimports
-RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.16.0
+RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.20.0
 RUN rm -rf /go/src /go/pkg
 
 RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
-    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2;  \
+    curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/refs/tags/v2.7.2/install.sh | sh -s -- v2.7.2; \
     fi
 
 ARG SELINUX=true

cmd/k3s/main_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 

cmd/k3s/main_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 

pkg/agent/config/config.go

@@ -343,7 +343,7 @@ func splitCertKeyPEM(bytes []byte) (certPem []byte, keyPem []byte) {
 		}
 	}
 
-	return
+	return certPem, keyPem
 }
 
 // getKubeletClientCert fills the kubelet client certificate with content returned
@@ -392,9 +392,8 @@ func isValidResolvConf(resolvConfFile string) bool {
 		if len(ipMatch) == 2 {
 			if !isValidNameserver(ipMatch[1]) {
 				return false
-			} else {
-				foundNameserver = true
 			}
+			foundNameserver = true
 		}
 	}
 	if err := scanner.Err(); err != nil {
@@ -833,7 +832,7 @@ func validateNetworkConfig(nodeConfig *config.Node) error {
 	// Old versions of the server do not send enough information to correctly start the NPC. Users
 	// need to upgrade the server to at least the same version as the agent, or disable the NPC
 	// cluster-wide.
-	if nodeConfig.AgentConfig.DisableNPC == false && (nodeConfig.AgentConfig.ServiceCIDR == nil || nodeConfig.AgentConfig.ServiceNodePortRange.Size == 0) {
+	if !nodeConfig.AgentConfig.DisableNPC && (nodeConfig.AgentConfig.ServiceCIDR == nil || nodeConfig.AgentConfig.ServiceNodePortRange.Size == 0) {
 		return fmt.Errorf("incompatible down-level server detected; servers must be upgraded to at least %s, or restarted with --disable-network-policy", version.Version)
 	}
 

pkg/agent/config/config_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package config
 

pkg/agent/config/config_linux_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package config
 

pkg/agent/config/config_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package config
 

pkg/agent/containerd/config.go

@@ -162,17 +162,17 @@ func getHostConfigs(registry *registries.Registry, noDefaultEndpoint bool, mirro
 		// create the default config, if it wasn't explicitly mentioned in the config section
 		config, ok := hosts[host]
 		if !ok {
-			if c, err := defaultHostConfig(host, mirrorAddr, configForHost(registry.Configs, host)); err != nil {
+			c, err := defaultHostConfig(host, mirrorAddr, configForHost(registry.Configs, host))
+			if err != nil {
 				logrus.Errorf("Failed to generate config for registry %s: %v", host, err)
 				continue
-			} else {
-				if noDefaultEndpoint {
-					c.Default = nil
-				} else if host == "*" {
-					c.Default = &templates.RegistryEndpoint{URL: &url.URL{}}
-				}
-				config = *c
 			}
+			if noDefaultEndpoint {
+				c.Default = nil
+			} else if host == "*" {
+				c.Default = &templates.RegistryEndpoint{URL: &url.URL{}}
+			}
+			config = *c
 		}
 
 		// track which endpoints we've already seen to avoid creating duplicates

pkg/agent/containerd/config_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package containerd
 

pkg/agent/containerd/config_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package containerd
 

pkg/agent/containerd/runtimes.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package containerd
 

pkg/agent/containerd/runtimes_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package containerd
 
@@ -130,9 +129,5 @@ func createExec(path string) error {
 		return err
 	}
 
-	if err := os.Chmod(path, 0755); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Chmod(path, 0755)
 }

pkg/agent/cri/cri_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cri
 

pkg/agent/cri/cri_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package cri
 

pkg/agent/cridockerd/config_linux.go

@@ -1,5 +1,4 @@
 //go:build linux && !no_cri_dockerd
-// +build linux,!no_cri_dockerd
 
 package cridockerd
 

pkg/agent/cridockerd/config_windows.go

@@ -1,5 +1,4 @@
 //go:build windows && !no_cri_dockerd
-// +build windows,!no_cri_dockerd
 
 package cridockerd
 

pkg/agent/cridockerd/cridockerd.go

@@ -1,5 +1,4 @@
 //go:build !no_cri_dockerd
-// +build !no_cri_dockerd
 
 package cridockerd
 

pkg/agent/cridockerd/nocridockerd.go

@@ -1,5 +1,4 @@
 //go:build no_cri_dockerd
-// +build no_cri_dockerd
 
 package cridockerd