Merge branch 'k8snetworkplumbingwg:master' into master

Author: almaslennikov

.github/dependabot.yaml

@@ -1,14 +1,37 @@
 version: 2
 updates:
+ # Docker images
 - package-ecosystem: docker
   directory: /images
   schedule:
     interval: weekly
+    day: monday
+  commit-message:
+    prefix: "chore:"
+
+# GitHub Actions
+- package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+      day: monday
+    commit-message:
+      prefix: "chore:"
+
+# Go modules
 - package-ecosystem: gomod
   directory: /
   schedule:
     interval: weekly
+    day: monday
+  commit-message:
+    prefix: "chore:"
   groups:
+    kubernetes-dependencies:
+      patterns:
+        - k8s.io/*
     gomod-dependencies:
       patterns:
-      - '*'
+        - '*'
+      exclude-patterns:
+        - k8s.io/*

.github/workflows/build-test-lint.yml

@@ -5,7 +5,7 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - name: Set up Go matrix
+      - name: Set up Go
         uses: actions/setup-go@v3
         with:
           go-version: 1.23.x

.github/workflows/codeql.yml

@@ -27,15 +27,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

.golangci.yml

@@ -1,116 +1,93 @@
-# Tested with golangci-lint ver. 1.37
+version: "2"
 run:
-  timeout: 3m
-
-linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
-  dupl:
-    threshold: 100
-  funlen:
-    lines: 100
-    statements: 50
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-    disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
-      - unnamedResult
-    settings:
-      hugeParam:
-        sizeThreshold: 512
-      rangeValCopy:
-        sizeThreshold: 512
-  gocyclo:
-    min-complexity: 15
-  goimports:
-    local-prefixes: github.com/k8snetworkplumbingwg/sriov-network-device-plugin
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
-  lll:
-    line-length: 140
-  misspell:
-    locale: US
-  prealloc:
-    # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
-    # True by default.
-    simple: true
-    range-loops: true # Report preallocation suggestions on range loops, true by default
-    for-loops: false # Report preallocation suggestions on for loops, false by default
-
+  timeout: 5m
+  allow-parallel-runners: true
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
+  default: none
   enable:
-    - bodyclose
-    # depguard has a bug in go 1.21 that will be fixed in future versions: https://github.com/kedacore/keda/pull/5285
-    #- depguard
-    - dogsled
+    - copyloopvar
     - dupl
     - errcheck
-    - copyloopvar
-    - exhaustive
     - funlen
-      #- gochecknoinits
+    - ginkgolinter
     - goconst
-    - gocritic
     - gocyclo
-    - gofmt
-    - goimports
-    - mnd
-    - goprintffuncname
+    - govet
+    - gocritic
     - gosec
-    - gosimple
-      #- govet
+    - goprintffuncname
+    - importas
     - ineffassign
     - lll
     - misspell
+    - mnd
     - nakedret
     - prealloc
-    - rowserrcheck
-      #- scopelint
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
+  settings:
+    dupl:
+      threshold: 100
+    funlen:
+      statements: 50
+      lines: 100
+    lll:
+      line-length: 140
+    mnd:
+      # don't include the "operation" and "assign"
+      checks: ["argument", "case", "condition", "return"]
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocyclo:
+      min-complexity: 15
+    gosec:
+      excludes:
+        - G304
+    ginkgolinter:
+      forbid-focus-container: true
+    misspell:
+      locale: US
+    staticcheck:
+      checks:
+        - all
+        - -ST1000
+        - -ST1003
+        - -QF1008
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+  exclusions:
+    generated: lax
+    paths:
+      - .github/*
+      - deployments/*
+      - docs/*
+      - pkg/utils/testing.go
+      - pkg/resources/testing.go
+    rules:
+      - linters:
+          - dupl
+          - goconst
+          - lll
+          - gosec
+        path: _test\.go
 
 issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-        - gosec
-        - dupl
-        - lll
-        - stylecheck
-        - goconst
-  exclude-dirs:
-    - .github/
-    - deployments/
-    - docs/
-    - images/
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/k8snetworkplumbingwg/sriov-network-device-plugin)
+      custom-order: true

Makefile

@@ -59,11 +59,11 @@ build: | $(BUILDDIR) ; $(info Building $(BINARY_NAME)...) @ ## Build SR-IOV Netw
 	$(info Done!)
 
 GOLANGCI_LINT = $(BINDIR)/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.63.4
+GOLANGCI_LINT_VERSION ?= v2.3.1
 $(GOLANGCI_LINT): | $(BINDIR) ; $(info  installing golangci-lint...)
 	$Q[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
 	}
 
 MOCKERY = $(BINDIR)/mockery
@@ -87,6 +87,10 @@ test-coverage: | $(COVERAGE_DIR) ; $(info  Running coverage tests...) @ ## Run c
 lint: $(GOLANGCI_LINT) ; $(info  Running golangci-lint linter...) @ ## Run golangci-lint linter
 	$Q $(GOLANGCI_LINT) run
 
+.PHONY: lint-fix
+lint-fix: $(GOLANGCI_LINT) ; $(info  Running golangci-lint linter with --fix...) @ ## Run golangci-lint linter with --fix to fix lint issues
+	$Q $(GOLANGCI_LINT) run --fix
+
 .PHONY: deps-update
 deps-update: ; $(info  Updating dependencies...) @ ## Update dependencies
 	$Q go mod tidy

cmd/sriovdp/manager_test.go

@@ -19,18 +19,17 @@ import (
 	"os"
 	"testing"
 
-	CDImocks "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/cdi/mocks"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/mock"
 
+	CDImocks "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/cdi/mocks"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/factory"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/netdevice"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types/mocks"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/utils"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
-	. "github.com/onsi/gomega"
-	"github.com/stretchr/testify/mock"
 )
 
 func TestSriovdp(t *testing.T) {
@@ -126,7 +125,7 @@ var _ = Describe("Resource manager", func() {
 				Expect(err).NotTo(HaveOccurred())
 			})
 			It("should load resources list", func() {
-				Expect(len(rm.configList)).To(Equal(2))
+				Expect(rm.configList).To(HaveLen(2))
 			})
 		})
 		Context("when the multi-selector config reading is successful", func() {
@@ -235,7 +234,7 @@ var _ = Describe("Resource manager", func() {
 			})
 			It("should return false", func() {
 				defer fs.Use()()
-				Expect(rm.validConfigs()).To(Equal(false))
+				Expect(rm.validConfigs()).To(BeFalse())
 			})
 		})
 		Context("when resource name is duplicated", func() {
@@ -269,7 +268,7 @@ var _ = Describe("Resource manager", func() {
 			})
 			It("should return false", func() {
 				defer fs.Use()()
-				Expect(rm.validConfigs()).To(Equal(false))
+				Expect(rm.validConfigs()).To(BeFalse())
 			})
 		})
 		Context("when both IsRdma and VdpaType are configured", func() {
@@ -298,7 +297,7 @@ var _ = Describe("Resource manager", func() {
 			})
 			It("should return false", func() {
 				defer fs.Use()()
-				Expect(rm.validConfigs()).To(Equal(false))
+				Expect(rm.validConfigs()).To(BeFalse())
 			})
 		})
 		Context("when isRdma and vdpaType are configured in separate selectors", func() {
@@ -331,7 +330,7 @@ var _ = Describe("Resource manager", func() {
 			})
 			It("should return true", func() {
 				defer fs.Use()()
-				Expect(rm.validConfigs()).To(Equal(true))
+				Expect(rm.validConfigs()).To(BeTrue())
 			})
 		})
 		Context("when isRdma and vdpaType are configured in a second selector", func() {
@@ -365,7 +364,7 @@ var _ = Describe("Resource manager", func() {
 			})
 			It("should return false", func() {
 				defer fs.Use()()
-				Expect(rm.validConfigs()).To(Equal(false))
+				Expect(rm.validConfigs()).To(BeFalse())
 			})
 		})
 		Describe("managing resources servers", func() {
@@ -386,7 +385,7 @@ var _ = Describe("Resource manager", func() {
 						Expect(rm.initServers()).NotTo(HaveOccurred())
 					})
 					It("should finish with empty list of servers", func() {
-						Expect(len(rm.resourceServers)).To(Equal(0))
+						Expect(rm.resourceServers).To(BeEmpty())
 					})
 				})
 				Context("when server is properly initialized", func() {

pkg/accelerator/accelDeviceProvider_test.go

@@ -15,17 +15,16 @@
 package accelerator_test
 
 import (
+	"github.com/jaypipes/ghw"
+	"github.com/jaypipes/pcidb"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/accelerator"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/factory"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types/mocks"
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/utils"
-
-	"github.com/jaypipes/ghw"
-	"github.com/jaypipes/pcidb"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("AcceleratorProvider", func() {