Remove extraneous type.

Author: Joshua Reed

api/v1beta2/cloudstackmachine_types.go

@@ -109,21 +109,18 @@ type CloudStackResourceDiskOffering struct {
 	Label string `json:"label"`
 }
 
-// TODO: Review the use of this field/type.
-type InstanceState string
-
 // Type pulled mostly from the CloudStack API.
 type CloudStackMachineStatus struct {
 	// Zone ID is used so that the zone can be computed once per reconcile and then propagate.
 	// +optional
-	ZoneID string `json:"zoneID,omitempty"`
+	ZoneID string `json:"zoneID"`
 
 	// Addresses contains a CloudStack VM instance's IP addresses.
-	Addresses []corev1.NodeAddress `json:"addresses,omitempty"`
+	Addresses []corev1.NodeAddress `json:"addresses"`
 
 	// InstanceState is the state of the CloudStack instance for this machine.
 	// +optional
-	InstanceState InstanceState `json:"instanceState,omitempty"`
+	InstanceState string `json:"instanceState"`
 
 	// InstanceStateLastUpdated is the time the instance state was last updated.
 	// +optional

pkg/cloud/instance.go

@@ -43,7 +43,7 @@ func setMachineDataFromVMMetrics(vmResponse *cloudstack.VirtualMachinesMetric, c
 	csMachine.Spec.ProviderID = pointer.StringPtr(fmt.Sprintf("cloudstack:///%s", vmResponse.Id))
 	csMachine.Spec.InstanceID = pointer.StringPtr(vmResponse.Id)
 	csMachine.Status.Addresses = []corev1.NodeAddress{{Type: corev1.NodeInternalIP, Address: vmResponse.Ipaddress}}
-	newInstanceState := infrav1.InstanceState(vmResponse.State)
+	newInstanceState := vmResponse.State
 	if newInstanceState != csMachine.Status.InstanceState || (newInstanceState != "" && csMachine.Status.InstanceStateLastUpdated.IsZero()) {
 		csMachine.Status.InstanceState = newInstanceState
 		csMachine.Status.InstanceStateLastUpdated = metav1.Now()