Bump golangci/golangci-lint-action from 6 to 7

.github/workflows/lint.yml

@@ -19,6 +19,6 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.62
+          version: v2.0

.golangci.yaml

@@ -1,21 +1,35 @@
-run:
-  timeout: 5m
-
+version: "2"
 linters:
   enable:
-    - revive
-    - ineffassign
-    - misspell
-    - goimports
     - importas
-
+    - misspell
+    - revive
+  settings:
+    revive:
+      severity: error
+      rules:
+        - name: exported
+        - name: if-return
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 severity:
-  default-severity: error
-
-linters-settings:
-  revive:
-    severity: error
-    rules:
-      - name: exported
-      - name: if-return
-        disabled: true
+  default: error
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -118,8 +118,8 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 KUSTOMIZE_VERSION ?= v5.5.0
 ADDLICENSE_VERSION ?= v1.1.1
 GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
-GOIMPORTS_VERSION ?= v0.26.0
-GOLANGCI_LINT_VERSION ?= v1.62.2
+GOIMPORTS_VERSION ?= v0.31.0
+GOLANGCI_LINT_VERSION ?= v2.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -150,4 +150,4 @@ $(GEN_CRD_API_REFERENCE_DOCS): $(LOCALBIN)
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT): $(LOCALBIN)
-	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)

pkg/ironcore/suite_test.go

@@ -210,11 +210,11 @@ func newMachine(namespace *corev1.Namespace, prefix string, setMachineIndex int,
 		}
 	}
 
-	machine.Spec.NodeTemplateSpec.ObjectMeta.Annotations = make(map[string]string)
+	machine.Spec.NodeTemplateSpec.Annotations = make(map[string]string)
 
 	//appending to already existing annotations
 	for k, v := range annotations {
-		machine.Spec.NodeTemplateSpec.ObjectMeta.Annotations[k] = v
+		machine.Spec.NodeTemplateSpec.Annotations[k] = v
 	}
 	return machine
 }