migrate to golangci-lint v2 (#1227)

Author: tariq1890

.github/workflows/golang.yaml

@@ -32,7 +32,7 @@ jobs:
       with:
         go-version: ${{ inputs.golang_version }}
     - name: Lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v7
       with:
         version: latest
         args: -v --timeout 5m

.golangci.yml

@@ -1,38 +1,59 @@
-run:
-  timeout: 10m
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
+version: "2"
 linters:
   enable:
     - contextcheck
-    - errcheck
     - gocritic
-    - gofmt
-    - goimports
     - gosec
-    - gosimple
-    - govet
-    - ineffassign
     - misspell
-    - staticcheck
     - unconvert
-  disable: []
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/NVIDIA/k8s-device-plugin
-
-issues:
-  exclude:
-  # A conversion of a uint8 to an int cannot overflow.
-  - "G115: integer overflow conversion uint8 -> int"
-  exclude-rules:
-  # We use math/rand instead of crypto/rand for unique names in e2e tests.
-  - path: tests/e2e/
-    linters:
-    - gosec
-    text: "G404"
-  # We create world-readable files in tests.
-  - path: ".*_test.go"
-    linters:
-    - gosec
-    text: "G306: Expect WriteFile permissions to be 0600 or less"
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - gosec
+        path: tests/e2e/
+        text: G404
+      - linters:
+          - gosec
+        path: .*_test.go
+        text: 'G306: Expect WriteFile permissions to be 0600 or less'
+      - path: (.+)\.go$
+        text: 'G115: integer overflow conversion uint8 -> int'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/NVIDIA/k8s-device-plugin
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/plugin/mps.go

@@ -53,7 +53,7 @@ func (o *options) getMPSOptions(resourceManager rm.ResourceManager) (mpsOptions,
 		enabled:      true,
 		resourceName: resourceManager.Resource(),
 		daemon:       mps.NewDaemon(resourceManager, mps.ContainerRoot),
-		hostRoot:     mps.Root(*o.config.Flags.CommandLineFlags.MpsRoot),
+		hostRoot:     mps.Root(*o.config.Flags.MpsRoot),
 	}
 	return m, nil
 }

internal/resource/nvml-device.go

@@ -83,7 +83,7 @@ func (d nvmlDevice) GetName() (string, error) {
 
 // GetTotalMemoryMiB returns the total memory on a device in mebibytes (2^20 bytes)
 func (d nvmlDevice) GetTotalMemoryMiB() (uint64, error) {
-	info, ret := d.Device.GetMemoryInfo()
+	info, ret := d.GetMemoryInfo()
 	if ret != nvml.SUCCESS {
 		return 0, ret
 	}

internal/resource/nvml-lib.go

@@ -37,7 +37,7 @@ func NewNVMLManager(nvmllib nvml.Interface, devicelib device.Interface) Manager
 
 // GetCudaDriverVersion : Return the cuda v using NVML
 func (l nvmlLib) GetCudaDriverVersion() (int, int, error) {
-	v, ret := l.Interface.SystemGetCudaDriverVersion()
+	v, ret := l.SystemGetCudaDriverVersion()
 	if ret != nvml.SUCCESS {
 		return 0, 0, ret
 	}
@@ -68,7 +68,7 @@ func (l nvmlLib) GetDevices() ([]Device, error) {
 
 // GetDriverVersion returns the driver version
 func (l nvmlLib) GetDriverVersion() (string, error) {
-	v, ret := l.Interface.SystemGetDriverVersion()
+	v, ret := l.SystemGetDriverVersion()
 	if ret != nvml.SUCCESS {
 		return "", ret
 	}

internal/resource/nvml-mig-device.go

@@ -95,7 +95,7 @@ func (d nvmlMigDevice) GetCudaComputeCapability() (int, int, error) {
 // GetName returns the name of the nvmlMigDevice.
 // This is equal to the mig profile.
 func (d nvmlMigDevice) GetName() (string, error) {
-	p, err := d.MigDevice.GetProfile()
+	p, err := d.GetProfile()
 	if err != nil {
 		return "", fmt.Errorf("failed to get MIG profile: %v", err)
 	}

internal/rm/health.go

@@ -177,7 +177,7 @@ func (r *nvmlResourceManager) checkHealth(stop <-chan interface{}, devices Devic
 		if d.IsMigDevice() && e.GpuInstanceId != 0xFFFFFFFF && e.ComputeInstanceId != 0xFFFFFFFF {
 			gi := deviceIDToGiMap[d.ID]
 			ci := deviceIDToCiMap[d.ID]
-			if !(gi == e.GpuInstanceId && ci == e.ComputeInstanceId) {
+			if gi != e.GpuInstanceId || ci != e.ComputeInstanceId {
 				continue
 			}
 			klog.Infof("Event for mig device %v (gi=%v, ci=%v)", d.ID, gi, ci)

internal/rm/nvml_devices.go

@@ -85,7 +85,7 @@ func (d nvmlDevice) GetPaths() ([]string, error) {
 
 // GetComputeCapability returns the CUDA Compute Capability for the device.
 func (d nvmlDevice) GetComputeCapability() (string, error) {
-	major, minor, ret := d.Device.GetCudaComputeCapability()
+	major, minor, ret := d.GetCudaComputeCapability()
 	if ret != nvml.SUCCESS {
 		return "", ret
 	}
@@ -94,7 +94,7 @@ func (d nvmlDevice) GetComputeCapability() (string, error) {
 
 // GetComputeCapability returns the CUDA Compute Capability for the device.
 func (d nvmlMigDevice) GetComputeCapability() (string, error) {
-	parent, ret := d.Device.GetDeviceHandleFromMigDeviceHandle()
+	parent, ret := d.GetDeviceHandleFromMigDeviceHandle()
 	if ret != nvml.SUCCESS {
 		return "", fmt.Errorf("failed to get parent device: %w", ret)
 	}
@@ -186,7 +186,7 @@ func (d nvmlMigDevice) GetNumaNode() (bool, int, error) {
 
 // GetTotalMemory returns the total memory available on the device.
 func (d nvmlDevice) GetTotalMemory() (uint64, error) {
-	info, ret := d.Device.GetMemoryInfo()
+	info, ret := d.GetMemoryInfo()
 	if ret != nvml.SUCCESS {
 		return 0, ret
 	}
@@ -195,7 +195,7 @@ func (d nvmlDevice) GetTotalMemory() (uint64, error) {
 
 // GetTotalMemory returns the total memory available on the device.
 func (d nvmlMigDevice) GetTotalMemory() (uint64, error) {
-	info, ret := d.Device.GetMemoryInfo()
+	info, ret := d.GetMemoryInfo()
 	if ret != nvml.SUCCESS {
 		return 0, ret
 	}