Merge pull request #12569 from sbueringer/pr-add-conflict-linter

✨ Add conflicting markers linter

Author: k8s-ci-robot

.golangci-kal.yml

@@ -16,6 +16,7 @@ linters:
             enable:
               - "commentstart" # Ensure comments start with the serialized version of the field name.
               - "conditions" # Ensure conditions have the correct json tags and markers.
+              - "conflictingmarkers"
               - "duplicatemarkers" # Ensure there are no exact duplicate markers. for types and fields.
               - "integers" # Ensure only int32 and int64 are used for integers.
               - "jsontags" # Ensure every field has a json tag.
@@ -42,6 +43,13 @@ linters:
             disable:
             - "*" # We will manually enable new linters after understanding the impact. Disable all by default.
           lintersConfig:
+            conflictingmarkers:
+              conflicts:
+              - name: "default_vs_required"
+                sets:
+                  - ["default", "kubebuilder:default"]
+                  - ["required", "kubebuilder:validation:Required", "k8s:required"]
+                description: "A field with a default value cannot be required"
             conditions:
               isFirstField: Warn # Require conditions to be the first field in the status struct.
               usePatchStrategy: Forbid # Forbid patchStrategy markers on the Conditions field.

hack/tools/.custom-gcl.yaml

@@ -3,4 +3,4 @@ name: golangci-lint-kube-api-linter
 destination: ./bin
 plugins:
 - module: 'sigs.k8s.io/kube-api-linter'
-  version: v0.0.0-20250723124831-1b29e82a0f55
+  version: v0.0.0-20250729132427-47bfeef6cd38