chore(deps): update https://github.com/kubernetes-sigs/kube-api-linter digest to 65a570b (#551)

* chore(deps): update https://github.com/kubernetes-sigs/kube-api-linter digest to 65a570b

* chore: adapt to kube-api-linter changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Patryk Małek <patryk.malek@konghq.com>

Author: renovate[bot]

.custom-gcl.yml

@@ -4,4 +4,4 @@ name: golangci-kube-api-linter
 destination: ./bin
 plugins:
 - module: 'sigs.k8s.io/kube-api-linter'
-  version: bdb40c631b356cf8018a246ec5b95e44b0fa9031
+  version: 65a570bd22aac3fe2eb0c3721b1cc4ea6ec41e48

.golangci-kube-api.yaml

@@ -71,3 +71,33 @@ linters:
           - kubeapilinter
         path: api/konnect/v1alpha1/.*
         text: "conditions: Conditions field must be the first field in the struct"
+
+      # TODO: remove this.
+      - linters:
+          - kubeapilinter
+        path: api/.*
+        text: "requiredfields: field .* should have the omitempty tag."
+
+      # TODO: remove this.
+      - linters:
+          - kubeapilinter
+        path: api/.*
+        text: "requiredfields: field .* does not allow the zero value. It must have the omitzero tag."
+
+      # TODO: remove this.
+      - linters:
+          - kubeapilinter
+        path: api/konnect/(v1alpha1|v1alpha2)/.*
+        text: 'requiredfields: field .* has a valid zero value .* but the validation is not complete'
+
+      # TODO: remove this.
+      - linters:
+          - kubeapilinter
+        path: api/gateway-operator/v2beta1/shared_types.go
+        text: 'requiredfields: field .* has a valid zero value .* but the validation is not complete'
+
+      # TODO: remove this.
+      - linters:
+          - kubeapilinter
+        path: api/gateway-operator/v2beta1/shared_types.go
+        text: 'requiredfields: field Strategy has a valid zero value .* and should be a pointer.'

api/common/v1alpha1/controlplaneref_types.go

@@ -85,6 +85,7 @@ type KonnectIDType string
 type KonnectNamespacedRef struct {
 	// Name is the name of the Konnect Control Plane.
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Name string `json:"name"`
 
 	// TODO: Implement cross namespace references:

api/common/v1alpha1/extensionref_types.go

@@ -29,6 +29,7 @@ type ExtensionRef struct {
 	// Kind is kind of the extension resource.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Kind string `json:"kind"`
 
 	// NamespacedRef is a reference to the extension resource.

api/gateway-operator/v2beta1/controlplane_types.go

@@ -300,6 +300,7 @@ type ControlPlaneDataPlaneTargetRef struct {
 	// Ref is the name of the DataPlane to configure.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Name string `json:"name"`
 }
 

api/gateway-operator/v2beta1/shared_types.go

@@ -55,11 +55,13 @@ type HorizontalScaling struct {
 	// alpha feature gate HPAScaleToZero is enabled and at least one Object or External
 	// metric is configured.  Scaling is active as long as at least one metric value is
 	// available.
+	//
 	// +optional
 	MinReplicas *int32 `json:"minReplicas,omitempty" protobuf:"varint,2,opt,name=minReplicas"`
 
 	// maxReplicas is the upper limit for the number of replicas to which the autoscaler can scale up.
 	// It cannot be less that minReplicas.
+	//
 	// +required
 	MaxReplicas int32 `json:"maxReplicas" protobuf:"varint,3,opt,name=maxReplicas"`
 
@@ -71,13 +73,15 @@ type HorizontalScaling struct {
 	// increased, and vice-versa.  See the individual metric source types for
 	// more information about how each type of metric must respond.
 	// If not set, the default metric will be set to 80% average CPU utilization.
+	//
 	// +listType=atomic
 	// +optional
 	Metrics []autoscalingv2.MetricSpec `json:"metrics,omitempty" protobuf:"bytes,4,rep,name=metrics"`
 
 	// behavior configures the scaling behavior of the target
 	// in both Up and Down directions (scaleUp and scaleDown fields respectively).
 	// If not set, the default HPAScalingRules for scale up and scale down are used.
+	//
 	// +optional
 	Behavior *autoscalingv2.HorizontalPodAutoscalerBehavior `json:"behavior,omitempty" protobuf:"bytes,5,opt,name=behavior"`
 }
@@ -249,6 +253,7 @@ type NamespacedName struct {
 	// Name is the name of the resource.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Name string `json:"name"`
 
 	// Namespace is the namespace of the resource.

api/konnect/v1alpha1/konnect_apiauthconfiguration_types.go

@@ -77,6 +77,7 @@ type KonnectAPIAuthConfigurationSpec struct {
 	// Please refer to https://docs.konghq.com/konnect/network/ for the list of supported hostnames.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:XValidation:rule="size(self) > 0", message="Server URL is required"
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="Server URL is immutable"
 	// +kubebuilder:validation:XValidation:rule="isURL(self) ? url(self).getScheme() == 'https' : true", message="Server URL must use HTTPs if specifying scheme"
@@ -87,6 +88,18 @@ type KonnectAPIAuthConfigurationSpec struct {
 // KonnectAPIAuthConfigurationStatus is the status of the KonnectAPIAuthConfiguration resource.
 // +apireference:kgo:include
 type KonnectAPIAuthConfigurationStatus struct {
+	// Conditions describe the status of the Konnect configuration.
+	//
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	// +kubebuilder:validation:MinItems=1
+	// +kubebuilder:validation:MaxItems=8
+	// +kubebuilder:default={{type: "Valid", status: "Unknown", reason:"Pending", message:"Waiting for controller", lastTransitionTime: "1970-01-01T00:00:00Z"}}
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
 	// OrganizationID is the unique identifier of the organization in Konnect.
 	//
 	// +optional
@@ -96,15 +109,6 @@ type KonnectAPIAuthConfigurationStatus struct {
 	//
 	// +optional
 	ServerURL string `json:"serverURL,omitempty"`
-
-	// Conditions describe the status of the Konnect configuration.
-	// +listType=map
-	// +listMapKey=type
-	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:MaxItems=8
-	// +kubebuilder:default={{type: "Valid", status: "Unknown", reason:"Pending", message:"Waiting for controller", lastTransitionTime: "1970-01-01T00:00:00Z"}}
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // KonnectAPIAuthConfigurationList contains a list of KonnectAPIAuthConfiguration resources.

api/konnect/v1alpha1/konnect_cloudgateway_dataplane_configuration_types.go

@@ -48,6 +48,7 @@ type KonnectCloudGatewayDataPlaneGroupConfigurationSpec struct {
 	// Version specifies the desired Kong Gateway version.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Version string `json:"version"`
 
 	// DataplaneGroups is a list of desired data-plane groups that describe where
@@ -92,6 +93,7 @@ type KonnectConfigurationDataPlaneGroup struct {
 	// Region for cloud provider region.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Region string `json:"region"`
 
 	// NetworkRef is the reference to the network that this data-plane group will be deployed on.
@@ -198,37 +200,41 @@ type ConfigurationDataPlaneGroupAutoscaleStatic struct {
 // KonnectCloudGatewayDataPlaneGroupConfigurationStatus defines the observed state of KonnectCloudGatewayDataPlaneGroupConfiguration.
 // +apireference:kgo:include
 type KonnectCloudGatewayDataPlaneGroupConfigurationStatus struct {
-	konnectv1alpha2.KonnectEntityStatusWithControlPlaneRef `json:",inline"`
-
-	// DataPlaneGroups is a list of deployed data-plane groups.
-	//
-	// +optional
-	DataPlaneGroups []KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup `json:"dataplane_groups,omitempty"`
-
 	// Conditions describe the current conditions of the KonnectCloudGatewayDataPlaneGroupConfiguration.
 	//
 	// Known condition types are:
 	//
 	// * "Programmed"
 	//
+	// +optional
 	// +listType=map
 	// +listMapKey=type
+	// +patchStrategy=merge
+	// +patchMergeKey=type
 	// +kubebuilder:validation:MaxItems=8
 	// +kubebuilder:default={{type: "Programmed", status: "Unknown", reason:"Pending", message:"Waiting for controller", lastTransitionTime: "1970-01-01T00:00:00Z"}}
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	// DataPlaneGroups is a list of deployed data-plane groups.
+	//
 	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	DataPlaneGroups []KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup `json:"dataplane_groups,omitempty"`
+
+	konnectv1alpha2.KonnectEntityStatusWithControlPlaneRef `json:",inline"`
 }
 
 // KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup defines the observed state of a deployed data-plane group.
 type KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup struct {
 	// ID is the ID of the deployed data-plane group.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	ID string `json:"id"`
 
 	// CloudGatewayNetworkID is the ID of the cloud gateway network.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	CloudGatewayNetworkID string `json:"cloud_gateway_network_id"`
 
 	// Name of cloud provider.
@@ -239,6 +245,7 @@ type KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup struct {
 	// Region ID for cloud provider region.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Region string `json:"region"`
 
 	// PrivateIPAddresses is a list of private IP addresses of the internal load balancer that proxies traffic to this data-plane group.
@@ -254,6 +261,7 @@ type KonnectCloudGatewayDataPlaneGroupConfigurationStatusGroup struct {
 	// State is the current state of the data plane group. Can be e.g. initializing, ready, terminating.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	State string `json:"state"`
 }
 

api/konnect/v1alpha1/konnect_cloudgateway_network_types.go

@@ -56,16 +56,19 @@ type KonnectCloudGatewayNetworkSpec struct {
 	// Specifies the name of the network on Konnect.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Name string `json:"name"`
 
 	// Specifies the provider Account ID.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	CloudGatewayProviderAccountID string `json:"cloud_gateway_provider_account_id"`
 
 	// Region ID for cloud provider region.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	Region string `json:"region"`
 
 	// List of availability zones that the network is attached to.
@@ -78,6 +81,7 @@ type KonnectCloudGatewayNetworkSpec struct {
 	// CIDR block configuration for the network.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	CidrBlock string `json:"cidr_block"`
 
 	// Initial state for creating a network.
@@ -92,25 +96,27 @@ type KonnectCloudGatewayNetworkSpec struct {
 // KonnectCloudGatewayNetworkStatus defines the observed state of KonnectCloudGatewayNetwork.
 // +apireference:kgo:include
 type KonnectCloudGatewayNetworkStatus struct {
-	konnectv1alpha2.KonnectEntityStatus `json:",inline"`
-
-	// State is the current state of the network. Can be e.g. initializing, ready, terminating.
-	//
-	// +optional
-	State string `json:"state,omitempty"`
-
 	// Conditions describe the current conditions of the KonnectCloudGatewayNetwork.
 	//
 	// Known condition types are:
 	//
 	// * "Programmed"
 	//
+	// +optional
 	// +listType=map
 	// +listMapKey=type
+	// +patchStrategy=merge
+	// +patchMergeKey=type
 	// +kubebuilder:validation:MaxItems=8
 	// +kubebuilder:default={{type: "Programmed", status: "Unknown", reason:"Pending", message:"Waiting for controller", lastTransitionTime: "1970-01-01T00:00:00Z"}}
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	// State is the current state of the network. Can be e.g. initializing, ready, terminating.
+	//
 	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	State string `json:"state,omitempty"`
+
+	konnectv1alpha2.KonnectEntityStatus `json:",inline"`
 }
 
 // GetKonnectAPIAuthConfigurationRef returns the Konnect API Auth Configuration Ref.

api/konnect/v1alpha1/konnect_cloudgateway_transitgateway_types.go

@@ -154,10 +154,12 @@ type AwsTransitGatewayAttachmentConfig struct {
 	// TransitGatewayID is the AWS transit gateway ID to create attachment to.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	TransitGatewayID string `json:"transit_gateway_id"`
 	// RAMShareArn is the resource share ARN to verify request to create transit gateway attachment.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	RAMShareArn string `json:"ram_share_arn"`
 }
 
@@ -166,42 +168,48 @@ type AzureVNETPeeringAttachmentConfig struct {
 	// TenantID is the tenant ID for the Azure VNET Peering attachment.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	TenantID string `json:"tenant_id"`
 	// SubscriptionID is the subscription ID for the Azure VNET Peering attachment.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	SubscriptionID string `json:"subscription_id"`
 	// ResourceGroupName is the resource group name for the Azure VNET Peering attachment.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	ResourceGroupName string `json:"resource_group_name"`
 	// VnetName is the VNET Name for the Azure VNET Peering attachment.
 	//
 	// +required
+	// +kubebuilder:validation:MinLength=1
 	VnetName string `json:"vnet_name"`
 }
 
 // KonnectCloudGatewayTransitGatewayStatus defines the current state of KonnectCloudGatewayTransitGateway.
 type KonnectCloudGatewayTransitGatewayStatus struct {
-	konnectv1alpha2.KonnectEntityStatusWithNetworkRef `json:",inline"`
-
-	// State is the state of the transit gateway on Konnect side.
-	//
-	// +optional
-	State sdkkonnectcomp.TransitGatewayState `json:"state,omitempty"`
-
 	// Conditions describe the current conditions of the KonnectCloudGatewayDataPlaneGroupConfiguration.
 	//
 	// Known condition types are:
 	//
 	// * "Programmed"
 	//
+	// +optional
 	// +listType=map
 	// +listMapKey=type
+	// +patchStrategy=merge
+	// +patchMergeKey=type
 	// +kubebuilder:validation:MaxItems=8
 	// +kubebuilder:default={{type: "Programmed", status: "Unknown", reason:"Pending", message:"Waiting for controller", lastTransitionTime: "1970-01-01T00:00:00Z"}}
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	konnectv1alpha2.KonnectEntityStatusWithNetworkRef `json:",inline"`
+
+	// State is the state of the transit gateway on Konnect side.
+	//
 	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	State sdkkonnectcomp.TransitGatewayState `json:"state,omitempty"`
 }
 
 // KonnectCloudGatewayTransitGatewayList contains a list of KonnectCloudGatewayTransitGateway.