Rename MHC unhealthyConditions to unhealthyNodeConditions

Signed-off-by: Stefan Büringer buringerst@vmware.com

Author: sbueringer

api/v1beta1/conversion.go

@@ -132,6 +132,42 @@ func Convert_v1beta1_ClusterClassSpec_To_v1beta2_ClusterClassSpec(in *ClusterCla
 	return nil
 }
 
+func Convert_v1beta1_MachineHealthCheckClass_To_v1beta2_MachineHealthCheckClass(in *MachineHealthCheckClass, out *clusterv1.MachineHealthCheckClass, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_MachineHealthCheckClass_To_v1beta2_MachineHealthCheckClass(in, out, s); err != nil {
+		return err
+	}
+
+	if len(in.UnhealthyConditions) > 0 {
+		for _, c := range in.UnhealthyConditions {
+			out.UnhealthyNodeConditions = append(out.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
+				Type:    c.Type,
+				Status:  c.Status,
+				Timeout: c.Timeout,
+			})
+		}
+	}
+
+	return nil
+}
+
+func Convert_v1beta2_MachineHealthCheckClass_To_v1beta1_MachineHealthCheckClass(in *clusterv1.MachineHealthCheckClass, out *MachineHealthCheckClass, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_MachineHealthCheckClass_To_v1beta1_MachineHealthCheckClass(in, out, s); err != nil {
+		return err
+	}
+
+	if len(in.UnhealthyNodeConditions) > 0 {
+		for _, c := range in.UnhealthyNodeConditions {
+			out.UnhealthyConditions = append(out.UnhealthyConditions, UnhealthyCondition{
+				Type:    c.Type,
+				Status:  c.Status,
+				Timeout: c.Timeout,
+			})
+		}
+	}
+
+	return nil
+}
+
 func Convert_v1beta1_LocalObjectTemplate_To_v1beta2_InfrastructureClass(in *LocalObjectTemplate, out *clusterv1.InfrastructureClass, s apimachineryconversion.Scope) error {
 	if in == nil {
 		return nil
@@ -383,6 +419,42 @@ func Convert_v1beta1_MachineDeploymentStatus_To_v1beta2_MachineDeploymentStatus(
 	return nil
 }
 
+func Convert_v1beta1_MachineHealthCheckSpec_To_v1beta2_MachineHealthCheckSpec(in *MachineHealthCheckSpec, out *clusterv1.MachineHealthCheckSpec, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_MachineHealthCheckSpec_To_v1beta2_MachineHealthCheckSpec(in, out, s); err != nil {
+		return err
+	}
+
+	if len(in.UnhealthyConditions) > 0 {
+		for _, c := range in.UnhealthyConditions {
+			out.UnhealthyNodeConditions = append(out.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
+				Type:    c.Type,
+				Status:  c.Status,
+				Timeout: c.Timeout,
+			})
+		}
+	}
+
+	return nil
+}
+
+func Convert_v1beta2_MachineHealthCheckSpec_To_v1beta1_MachineHealthCheckSpec(in *clusterv1.MachineHealthCheckSpec, out *MachineHealthCheckSpec, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_MachineHealthCheckSpec_To_v1beta1_MachineHealthCheckSpec(in, out, s); err != nil {
+		return err
+	}
+
+	if len(in.UnhealthyNodeConditions) > 0 {
+		for _, c := range in.UnhealthyNodeConditions {
+			out.UnhealthyConditions = append(out.UnhealthyConditions, UnhealthyCondition{
+				Type:    c.Type,
+				Status:  c.Status,
+				Timeout: c.Timeout,
+			})
+		}
+	}
+
+	return nil
+}
+
 func Convert_v1beta2_MachineHealthCheckStatus_To_v1beta1_MachineHealthCheckStatus(in *clusterv1.MachineHealthCheckStatus, out *MachineHealthCheckStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_MachineHealthCheckStatus_To_v1beta1_MachineHealthCheckStatus(in, out, s); err != nil {
 		return err

api/v1beta1/zz_generated.conversion.go

@@ -376,13 +376,13 @@ type MachineDeploymentClassNamingStrategy struct {
 
 // MachineHealthCheckClass defines a MachineHealthCheck for a group of Machines.
 type MachineHealthCheckClass struct {
-	// unhealthyConditions contains a list of the conditions that determine
+	// unhealthyNodeConditions contains a list of conditions that determine
 	// whether a node is considered unhealthy. The conditions are combined in a
 	// logical OR, i.e. if any of the conditions is met, the node is unhealthy.
 	//
 	// +optional
 	// +kubebuilder:validation:MaxItems=100
-	UnhealthyConditions []UnhealthyCondition `json:"unhealthyConditions,omitempty"`
+	UnhealthyNodeConditions []UnhealthyNodeCondition `json:"unhealthyNodeConditions,omitempty"`
 
 	// maxUnhealthy specifies the maximum number of unhealthy machines allowed.
 	// Any further remediation is only allowed if at most "maxUnhealthy" machines selected by

api/v1beta2/clusterclass_types.go

@@ -61,13 +61,13 @@ type MachineHealthCheckSpec struct {
 	// +required
 	Selector metav1.LabelSelector `json:"selector"`
 
-	// unhealthyConditions contains a list of the conditions that determine
-	// whether a node is considered unhealthy.  The conditions are combined in a
+	// unhealthyNodeConditions contains a list of conditions that determine
+	// whether a node is considered unhealthy. The conditions are combined in a
 	// logical OR, i.e. if any of the conditions is met, the node is unhealthy.
 	//
 	// +optional
 	// +kubebuilder:validation:MaxItems=100
-	UnhealthyConditions []UnhealthyCondition `json:"unhealthyConditions,omitempty"`
+	UnhealthyNodeConditions []UnhealthyNodeCondition `json:"unhealthyNodeConditions,omitempty"`
 
 	// maxUnhealthy specifies the maximum number of unhealthy machines allowed.
 	// Any further remediation is only allowed if at most "maxUnhealthy" machines selected by
@@ -120,12 +120,12 @@ type MachineHealthCheckSpec struct {
 
 // ANCHOR_END: MachineHealthCHeckSpec
 
-// ANCHOR: UnhealthyCondition
+// ANCHOR: UnhealthyNodeCondition
 
-// UnhealthyCondition represents a Node condition type and value with a timeout
+// UnhealthyNodeCondition represents a Node condition type and value with a timeout
 // specified as a duration.  When the named condition has been in the given
 // status for at least the timeout value, a node is considered unhealthy.
-type UnhealthyCondition struct {
+type UnhealthyNodeCondition struct {
 	// type of Node condition
 	// +kubebuilder:validation:Type=string
 	// +kubebuilder:validation:MinLength=1
@@ -146,7 +146,7 @@ type UnhealthyCondition struct {
 	Timeout metav1.Duration `json:"timeout"`
 }
 
-// ANCHOR_END: UnhealthyCondition
+// ANCHOR_END: UnhealthyNodeCondition
 
 // ANCHOR: MachineHealthCheckStatus