Bump golangci/golangci-lint-action from 6 to 7 (#531)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andreas Fritzler <[email protected]>

Author: dependabot[bot]

.github/workflows/golangci-lint.yml .github/workflows/lint.yml.github/workflows/golangci-lint.yml renamed to .github/workflows/lint.yml

@@ -16,6 +16,6 @@ jobs:
           go-version-file: 'go.mod'
       - run: sudo apt update  && sudo apt install -y libcephfs-dev librbd-dev librados-dev
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64
+          version: v2.0

.golangci.yaml

@@ -1,28 +1,40 @@
-run:
-  timeout: 10m
-
+version: "2"
 linters:
   enable:
-    - revive
-    - ineffassign
     - misspell
-    - goimports
-
-severity:
-  default-severity: error
-
-linters-settings:
-  misspell:
-    ignore-words:
-      - strat
-  revive:
-    severity: error
+    - revive
+  settings:
+    misspell:
+      ignore-rules:
+        - strat
+    revive:
+      severity: error
+      rules:
+        - name: exported
+        - name: if-return
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: exported
-      - name: if-return
-        disabled: true
-
-issues:
-  exclude:
-    # Exclude stutter issues (for now)
-    - "exported: type name will be used as (.+) by other packages, and that stutters; consider calling this (.+)"
+      - path: (.+)\.go$
+        text: 'exported: type name will be used as (.+) by other packages, and that stutters; consider calling this (.+)'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+severity:
+  default: error
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -163,7 +163,7 @@ ADDLICENSE ?= $(LOCALBIN)/addlicense-$(ADDLICENSE_VERSION)
 KUSTOMIZE_VERSION ?= v5.3.0
 CONTROLLER_TOOLS_VERSION ?= v0.16.0
 ENVTEST_VERSION ?= release-0.19
-GOLANGCI_LINT_VERSION ?= v1.64.6
+GOLANGCI_LINT_VERSION ?= v2.0
 ADDLICENSE_VERSION ?= v1.1.1
 
 .PHONY: kustomize
@@ -180,7 +180,7 @@ envtest: $(LOCALBIN) ## Download setup-envtest locally if necessary.
 
 .PHONY: golangci-lint
 golangci-lint: $(LOCALBIN) ## Download golangci-lint locally if necessary.
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})
 
 .PHONY: clean-tools
 clean-tools: ## Clean any artifacts that can be regenerated.

go.mod

@@ -1,7 +1,6 @@
 module github.com/ironcore-dev/libvirt-provider
 
-go 1.24
-toolchain go1.24.1
+go 1.24.0
 
 require (
 	github.com/blang/semver/v4 v4.0.0

internal/controllers/machine_controller.go

@@ -784,7 +784,7 @@ func (r *MachineReconciler) domainFor(
 }
 
 func (r *MachineReconciler) setDomainMetadata(log logr.Logger, machine *api.Machine, domain *libvirtxml.Domain) error {
-	labels, found := machine.Metadata.Annotations[api.LabelsAnnotation]
+	labels, found := machine.Annotations[api.LabelsAnnotation]
 	if !found {
 		log.V(1).Info("IRI machine labels are not annotated in the API machine")
 		return nil