linode
diff --git a/‎.github/workflows/build-test.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/build-test.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.golangci.yml‎
Lines changed: 131 additions & 150 deletions b/‎.golangci.yml‎
Lines changed: 131 additions & 150 deletions
diff --git a/‎Makefile‎
Lines changed: 2 additions & 2 deletions b/‎Makefile‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎cloud/linode/loadbalancers.go‎
Lines changed: 1 addition & 1 deletion b/‎cloud/linode/loadbalancers.go‎
Lines changed: 1 addition & 1 deletion
@@ -74,9 +74,9 @@ jobs:
         run: make vet
 
       - name: lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64.5
+          version: v2.1.5
 
       - name: Helm Lint
         run: make helm-lint
 
@@ -1,206 +1,187 @@
+version: "2"
 run:
-  timeout: 5m
   issues-exit-code: 1
-
 output:
   formats:
-    - format: colored-line-number
-
-linters-settings:
-  cyclop:
-    max-complexity: 15
-
-  depguard:
-    rules:
-      main:
-        files:
-          - "$all"
-          - "!$test"
-        deny:
-          # TODO: Remove reflect from loadbalancers.go and reinstate this requirement
-          #- pkg: "reflect"
-          #  desc: "Reflection is never clear."
-          - pkg: "gob"
-            desc: "Please convert types manually"
-
-  dupl:
-    threshold: 100
-
-  errcheck:
-    check-type-assertions: true
-    check-blank: true
-    exclude-functions:
-      - fmt:.*
-      - io/ioutil:^Read.*
-
-  gci:
-    sections:
-      - standard
-      - default
-      - blank
-      - dot
-      - prefix(github.com/linode/linode-cloud-controller-manager)
-
-  goconst:
-    min-len: 3
-    min-occurrences: 5
-
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-
-    settings:
-      captLocal:
-        paramsOnly: true
-      rangeValCopy:
-        sizeThreshold: 32
-
-  gofmt:
-    simplify: true
-
-  goimports:
-    local-prefixes: github.com/linode/linode-cloud-controller-manager
-
-  govet:
-    enable:
-      - shadow
-
-  gosec:
-    confidence: "medium"
-    excludes:
-      - G115
-
-  mnd:
-    checks:
-      - case
-      - condition
-      - operation
-      - return
-      # Ignoring argument and assign due to the number of cases we're ignoring
-
-  nolintlint:
-    require-explanation: true
-    require-specific: true
-
-  prealloc:
-    simple: true
-    range-loops: true
-    for-loops: true
-
-  varnamelen:
-    min-name-length: 2
-
+    text:
+      path: stdout
 linters:
-  disable-all: true
+  default: none
   enable:
-    # these are enabled by default
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    - ginkgolinter 
     - asasalint
     - asciicheck
     - bidichk
     - bodyclose
     - containedctx
     - contextcheck
     - copyloopvar
-    #- cyclop
     - decorder
     - depguard
     - dogsled
     - dupl
     - dupword
     - durationcheck
+    - errcheck
     - errchkjson
     - errname
     - errorlint
     - exhaustive
     - forbidigo
     - forcetypeassert
-    - gci
+    - ginkgolinter
     - gocheckcompilerdirectives
-    - gofmt
-    - goimports
-    #- gocognit
+    - gochecksumtype
     - goconst
-    #- gocritic
-    - gofumpt
     - goprintffuncname
     - gosec
+    - gosmopolitan
+    - govet
     - importas
+    - ineffassign
     - loggercheck
     - maintidx
     - makezero
     - misspell
     - mnd
     - musttag
-    #- nestif
     - nilerr
+    - nilnesserr
     - nilnil
     - noctx
     - nolintlint
     - nosprintfhostport
-    #- paralleltest # adding t.Parallel() to tests broke so many and made others flaky
     - prealloc
     - predeclared
+    - protogetter
     - reassign
+    - recvcheck
+    - rowserrcheck
+    - spancheck
+    - sqlclosecheck
+    - staticcheck
     - testifylint
     - thelper
     - unconvert
     - unparam
+    - unused
     - usestdlibvars
     - usetesting
     - varnamelen
     - wastedassign
     - whitespace
-  
-  presets:
-    - bugs
-    - unused
-  fast: false
-
+    - zerologlint
+  settings:
+    cyclop:
+      max-complexity: 15
+    depguard:
+      rules:
+        main:
+          files:
+            - $all
+            - '!$test'
+          deny:
+            - pkg: gob
+              desc: Please convert types manually
+    dupl:
+      threshold: 100
+    errcheck:
+      check-type-assertions: true
+      check-blank: true
+      exclude-functions:
+        - fmt:.*
+        - io/ioutil:^Read.*
+    goconst:
+      min-len: 3
+      min-occurrences: 5
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+      settings:
+        captLocal:
+          paramsOnly: true
+        rangeValCopy:
+          sizeThreshold: 32
+    gosec:
+      excludes:
+        - G115
+      confidence: medium
+    govet:
+      enable:
+        - shadow
+    mnd:
+      checks:
+        - case
+        - condition
+        - operation
+        - return
+    nolintlint:
+      require-explanation: true
+      require-specific: true
+    prealloc:
+      simple: true
+      range-loops: true
+      for-loops: true
+    varnamelen:
+      min-name-length: 2
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - copyloopvar
+          - dupl
+          - errcheck
+          - gocyclo
+          - gosec
+          - maintidx
+          - unparam
+          - varnamelen
+        path: _test(ing)?\.go
+      - linters:
+          - gocritic
+        path: _test\.go
+        text: (unnamedResult|exitAfterDefer)
+      - linters:
+          - gosec
+        text: 'G101:'
+      - linters:
+          - gosec
+        text: 'G104:'
+    paths:
+      - zz_generated\..+\.go$
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test(ing)?\.go
-      linters:
-        - gocyclo
-        - maintidx
-        - errcheck
-        - dupl
-        - gosec
-        - copyloopvar
-        - unparam
-        - varnamelen
-
-    # Ease some gocritic warnings on test files.
-    - path: _test\.go
-      text: "(unnamedResult|exitAfterDefer)"
-      linters:
-        - gocritic
-
-    - text: "G101:"
-      linters:
-        - gosec
-        - gas
-
-    - text: "G104:"
-      linters:
-        - gosec
-        - gas
-
-  exclude-use-default: false
-  new: false
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-files:
-    - "zz_generated\\..+\\.go$"
+  new: false
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - blank
+        - dot
+        - prefix(github.com/linode/linode-cloud-controller-manager)
+    gofmt:
+      simplify: true
+    goimports:
+      local-prefixes:
+        - github.com/linode/linode-cloud-controller-manager
+  exclusions:
+    generated: lax
+    paths:
+      - zz_generated\..+\.go$
+      - third_party$
+      - builtin$
+      - examples$
@@ -30,6 +30,7 @@ LINODE_OS               ?= linode/ubuntu22.04
 KUBECONFIG_PATH         ?= $(CURDIR)/test-cluster-kubeconfig.yaml
 SUBNET_KUBECONFIG_PATH	?= $(CURDIR)/subnet-testing-kubeconfig.yaml
 MGMT_KUBECONFIG_PATH    ?= $(CURDIR)/mgmt-cluster-kubeconfig.yaml
+GOLANGCI_LINT_VERSION   ?= v2.1.5
 
 # if the $DEVBOX_PACKAGES_DIR env variable exists that means we are within a devbox shell and can safely
 # use devbox's bin for our tools
@@ -64,8 +65,7 @@ vet: fmt
 
 .PHONY: lint
 lint:
-	docker run --rm -v "$(PWD):/var/work:ro" -w /var/work \
-		golangci/golangci-lint:latest golangci-lint run -c .golangci.yml
+	docker run --rm -w /workdir -v $(PWD):/workdir golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint run -c .golangci.yml --fix
 
 .PHONY: gosec
 gosec: ## Run gosec against code.
 
@@ -889,7 +889,7 @@ func (l *loadbalancers) buildNodeBalancerNodeConfigRebuildOptions(node *v1.Node,
 		},
 	}
 	if subnetID != 0 {
-		nodeOptions.NodeBalancerNodeCreateOptions.SubnetID = subnetID
+		nodeOptions.SubnetID = subnetID
 	}
 	return nodeOptions
 }
Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,7 @@ func (l loadbalancers) buildNodeBalancerNodeConfigRebuildOptions(node v1.Node,`
`889`	`889`	`},`
`890`	`890`	`}`
`891`	`891`	`if subnetID != 0 {`
`892`		`- nodeOptions.NodeBalancerNodeCreateOptions.SubnetID = subnetID`
	`892`	`+ nodeOptions.SubnetID = subnetID`
`893`	`893`	`}`
`894`	`894`	`return nodeOptions`
`895`	`895`	`}`