Merge pull request #12326 from sbueringer/pr-bump-kal-drop-items

🌱 Bump KAL to 20250605073038, cleanup excludes, fix IPAM prefix field, add MaxItems to Machine.status.addresses

Author: k8s-ci-robot

.golangci-kal.yml

@@ -57,48 +57,63 @@ linters:
       - internal/api/.*
       - ".*_test.go"  # Exclude test files.
     rules:
-    # KAL should only run on API folders.
+    ## KAL should only run on API folders.
     - path-except: "api//*"
       linters:
         - kubeapilinter
+
+    ## Excludes that can be removed once v1alpha1/v1beta1 apiVersions are dropped
+
+    # .status.deprecated.v1beta1.conditions fields are using v1beta1.Condition types, these fields will be removed once v1alpha1/v1beta1 is removed.
     - path: "api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/ipam/v1beta2/*|api/runtime/v1beta2/*|api/addons/v1beta1/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/core/v1beta1/*|api/ipam/v1beta1/*|api/ipam/v1alpha1/*|api/runtime/v1alpha1/*"
       text: "Conditions field must be a slice of metav1.Condition"
       linters:
         - kubeapilinter
+    - path: "api/core/v1beta2/*|api/core/v1beta1/*"
+      text: "field Conditions type Conditions must have a maximum items, add kubebuilder:validation:MaxItems marker"
+      linters:
+        - kubeapilinter
+    # excludes for v1alpha1/v1beta1 API packages
     - path: "api/core/v1beta1/*"
       text: "type ClusterIPFamily should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
       linters:
         - kubeapilinter
-    - path: "api/ipam/v1beta2/*|api/ipam/v1alpha1/*|api/ipam/v1beta1/*"
+    - path: "api/ipam/v1alpha1/*|api/ipam/v1beta1/*"
       text: "field Prefix should not use an int, int8 or int16. Use int32 or int64 depending on bounding requirements"
       linters:
         - kubeapilinter
-    # clusterctl and Runtime Hooks can be fixed once we bump their apiVersion.
+    - path: "api/core/v1beta1/*"
+      text: "field Addresses type MachineAddresses must have a maximum items, add kubebuilder:validation:MaxItems marker"
+      linters:
+        - kubeapilinter
+
+    ## Excludes for clusterctl and Runtime Hooks (can be fixed once we bump their apiVersion)
     - path: "cmd/clusterctl/api/v1alpha3|api/runtime/hooks/v1alpha1"
       text: "maxlength"
       linters:
         - kubeapilinter
-    # controller-gen does not allow to add MaxItems to Schemaless fields
+
+    ## controller-gen does not allow to add MaxItems to Schemaless fields
     - path: "api/core/v1beta2/*|api/core/v1beta1/*"
       text: "maxlength: field (AllOf|OneOf|AnyOf) must have a maximum items, add kubebuilder:validation:MaxItems marker"
       linters:
         - kubeapilinter
-    # It does not make sense to add a maxItems marker on the *List structs as they are not used to generate CRD YAMLs.
-    # This exclude will  be removed once https://github.com/JoelSpeed/kubeapilinter/issues/38 is resolved.
-    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/core/v1beta1/*|api/v1alpha1/*|api/addons/v1beta1/*"
-      text: "maxlength: field Items must have a maximum items, add kubebuilder:validation:MaxItems marker"
-      linters:
-        - kubeapilinter
+
+    ## Removal of bool fields of existing types requires further discussion
     - path: "api/bootstrap/kubeadm/v1beta2/*|api/controlplane/kubeadm/v1beta2/*|api/core/v1beta2/*|api/addons/v1beta2/*|api/bootstrap/kubeadm/v1beta1/*|api/controlplane/kubeadm/v1beta1/*|api/v1alpha1/*|api/core/v1beta1/*|api/addons/v1beta1/*"
       text: "nobools"
       linters:
         - kubeapilinter
-    # We follow the current CustomResourceDefinition field's json tag pattern.
+
+    ## Excludes for JSONSchemaProps
+    # We want to align to the JSON tags of the CustomResourceDefinition fields.
     - path: "api/core/v1beta2/*|api/core/v1beta1/*"
       text: "field (XPreserveUnknownFields|XPreserveUnknownFields|XValidations|XMetadata|XIntOrString) json tag does not match pattern"
       linters:
         - kubeapilinter
-    # The following rules are disabled until we migrate to the new API.
+
+    ## TODO: The following rules are disabled until we migrate to the new API.
+    # Note: Maybe this has to stay a pointer for marshalling reasons.
     - path: "api/bootstrap/kubeadm/v1beta2/kubeadm_types.go|api/bootstrap/kubeadm/v1beta1/kubeadm_types.go"
       text: "field Token is marked as required, should not be a pointer"
       linters:
@@ -107,10 +122,6 @@ linters:
       text: "field Ref is marked as required, should not be a pointer"
       linters:
         - kubeapilinter
-    - path: "api/core/v1beta2/*|api/addons/v1beta2/*|api/v1alpha1/*|api/core/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*|api/runtime/v1beta2/*|api/runtime/v1alpha1/*|api/runtime/hooks/v1alpha1/*"
-      text: "field Items must be marked as optional or required"
-      linters:
-        - kubeapilinter
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0

api/core/v1beta2/common_types.go

@@ -307,6 +307,7 @@ type MachineAddress struct {
 }
 
 // MachineAddresses is a slice of MachineAddress items to be used by infrastructure providers.
+// +kubebuilder:validation:MaxItems=32
 type MachineAddresses []MachineAddress
 
 // ObjectMeta is metadata that all persisted resources must have, which includes all objects

api/ipam/v1alpha1/zz_generated.conversion.go

@@ -39,7 +39,7 @@ type IPAddressSpec struct {
 
 	// prefix is the prefix of the address.
 	// +required
-	Prefix int `json:"prefix"`
+	Prefix int32 `json:"prefix"`
 
 	// gateway is the network gateway of the network the address is from.
 	// +optional

api/ipam/v1beta1/zz_generated.conversion.go

@@ -39,6 +39,7 @@ type GeneratePatchesRequest struct {
 	Variables []Variable `json:"variables,omitempty"`
 
 	// items is the list of templates to generate patches for.
+	// +required
 	Items []GeneratePatchesRequestItem `json:"items"`
 }
 

api/ipam/v1beta2/ipaddress_types.go

@@ -3,4 +3,4 @@ name: golangci-lint-kube-api-linter
 destination: ./bin
 plugins:
 - module: 'sigs.k8s.io/kube-api-linter'
-  version: v0.0.0-20250515061849-37102c8f17a9
+  version: v0.0.0-20250605073038-74075c8eae51