KAL: Enabled conditions linter

Enable the linter and fix the issues it reported.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

Author: lentzi90

.golangci-kal.yml

@@ -15,7 +15,7 @@ linters:
           linters:
             enable:
             - "commentstart" # Ensure comments start with the serialized version of the field name.
-            # - "conditions" # Ensure conditions have the correct json tags and markers.
+            - "conditions" # Ensure conditions have the correct json tags and markers.
             # - "conflictingmarkers" # Ensure there are no conflicting markers.
             - "duplicatemarkers" # Ensure there are no exact duplicate markers for types and fields.
             # - "forbiddenmarkers" # Ensure that types and fields do not contain any markers that are forbidden.

api/v1beta1/zz_generated.conversion.go

@@ -199,6 +199,15 @@ type ClusterInitialization struct {
 
 // OpenStackClusterStatus defines the observed state of OpenStackCluster.
 type OpenStackClusterStatus struct {
+	// conditions defines current service state of the OpenStackCluster.
+	// This field surfaces into Cluster's status.conditions[InfrastructureReady] condition.
+	// The Ready condition must surface issues during the entire lifecycle of the OpenStackCluster
+	// (both during initial provisioning and after the initial provisioning is completed).
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
 	// initialization contains information about the initialization status of the cluster.
 	// +optional
 	Initialization *ClusterInitialization `json:"initialization,omitempty"`
@@ -241,13 +250,6 @@ type OpenStackClusterStatus struct {
 	// bastion contains the information about the deployed bastion host
 	// +optional
 	Bastion *BastionStatus `json:"bastion,omitempty"`
-
-	// conditions defines current service state of the OpenStackCluster.
-	// This field surfaces into Cluster's status.conditions[InfrastructureReady] condition.
-	// The Ready condition must surface issues during the entire lifecycle of the OpenStackCluster
-	// (both during initial provisioning and after the initial provisioning is completed).
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +genclient

api/v1beta2/openstackcluster_types.go

@@ -186,6 +186,15 @@ type MachineInitialization struct {
 
 // OpenStackMachineStatus defines the observed state of OpenStackMachine.
 type OpenStackMachineStatus struct {
+	// conditions defines current service state of the OpenStackMachine.
+	// This field surfaces into Machine's status.conditions[InfrastructureReady] condition.
+	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachine
+	// (both during initial provisioning and after the initial provisioning is completed).
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
 	// initialization contains information about the initialization status of the machine.
 	// +optional
 	Initialization *MachineInitialization `json:"initialization,omitempty"`
@@ -211,13 +220,6 @@ type OpenStackMachineStatus struct {
 	// resources contains references to OpenStack resources created for the machine.
 	// +optional
 	Resources *MachineResources `json:"resources,omitempty"`
-
-	// conditions defines current service state of the OpenStackMachine.
-	// This field surfaces into Machine's status.conditions[InfrastructureReady] condition.
-	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachine
-	// (both during initial provisioning and after the initial provisioning is completed).
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +genclient

api/v1beta2/openstackmachine_types.go

@@ -29,6 +29,14 @@ type OpenStackMachineTemplateSpec struct {
 
 // OpenStackMachineTemplateStatus defines the observed state of OpenStackMachineTemplate.
 type OpenStackMachineTemplateStatus struct {
+	// conditions defines current service state of the OpenStackMachineTemplate.
+	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
+	// (both during initial provisioning and after the initial provisioning is completed).
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
 	// capacity defines the resource capacity for this machine.
 	// This value is used for autoscaling from zero operations as defined in:
 	// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
@@ -37,12 +45,6 @@ type OpenStackMachineTemplateStatus struct {
 	// nodeInfo contains information about the node's operating system.
 	// +optional
 	NodeInfo NodeInfo `json:"nodeInfo,omitempty,omitzero"`
-
-	// conditions defines current service state of the OpenStackMachineTemplate.
-	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
-	// (both during initial provisioning and after the initial provisioning is completed).
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // NodeInfo contains information about the node's architecture and operating system.

api/v1beta2/openstackmachinetemplate_types.go

@@ -30,13 +30,10 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,MachineResources,Ports
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,NetworkStatus,Tags
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,NetworkStatusWithSubnets,Subnets
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackClusterStatus,Conditions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackClusterStatus,FailureDomains
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,Ports
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,SecurityGroups
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineStatus,Addresses
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineStatus,Conditions
-API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineTemplateStatus,Conditions
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedMachineSpec,Ports
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedPortSpecFields,AllowedAddressPairs
 API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Router,IPs