remove from old apis, ensure unhealthyMachineConditions is used/tested everywhere

Author: justinmir

api/core/v1beta1/conversion_test.go

@@ -75,6 +75,7 @@ func TestFuzzyConversion(t *testing.T) {
 
 func ClusterFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
+		hubClusterSpec,
 		hubClusterStatus,
 		spokeClusterTopology,
 		spokeClusterStatus,
@@ -99,6 +100,21 @@ func hubClusterStatus(in *clusterv1.ClusterStatus, c fuzz.Continue) {
 	}
 }
 
+func hubClusterSpec(in *clusterv1.ClusterSpec, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// remove MachineHealthCheck.UnhealthyMachineConditions as it does not exist in v1beta1.
+	if in.Topology != nil && in.Topology.ControlPlane.MachineHealthCheck != nil {
+		in.Topology.ControlPlane.MachineHealthCheck.UnhealthyMachineConditions = nil
+	}
+
+	if in.Topology != nil && in.Topology.Workers != nil && len(in.Topology.Workers.MachineDeployments) > 0 {
+		for i := range in.Topology.Workers.MachineDeployments {
+			in.Topology.Workers.MachineDeployments[i].MachineHealthCheck = nil
+		}
+	}
+}
+
 func spokeClusterTopology(in *Topology, c fuzz.Continue) {
 	c.FuzzNoCustom(in)
 
@@ -129,6 +145,22 @@ func ClusterClassFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 		hubJSONSchemaProps,
 		spokeClusterClassStatus,
 		spokeJSONSchemaProps,
+		hubClusterClassSpec,
+	}
+}
+
+func hubClusterClassSpec(in *clusterv1.ClusterClassSpec, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// remove MachineHealthCheck.UnhealthyMachineConditions as it does not exist in v1beta1.
+	if in.ControlPlane.MachineHealthCheck != nil && in.ControlPlane.MachineHealthCheck.UnhealthyMachineConditions != nil {
+		in.ControlPlane.MachineHealthCheck.UnhealthyMachineConditions = nil
+	}
+
+	if len(in.Workers.MachineDeployments) > 0 {
+		for i := range in.Workers.MachineDeployments {
+			in.Workers.MachineDeployments[i].MachineHealthCheck = nil
+		}
 	}
 }
 
@@ -348,11 +380,21 @@ func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c fuzz.Continue)
 
 func MachineHealthCheckFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
+		hubMachineHealthCheckSpec,
 		hubMachineHealthCheckStatus,
 		spokeMachineHealthCheckStatus,
 	}
 }
 
+func hubMachineHealthCheckSpec(in *clusterv1.MachineHealthCheckSpec, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// Drop UnhealthyMachineConditions as it does not exist in v1beta1.
+	if in.UnhealthyMachineConditions != nil {
+		in.UnhealthyMachineConditions = nil
+	}
+}
+
 func hubMachineHealthCheckStatus(in *clusterv1.MachineHealthCheckStatus, c fuzz.Continue) {
 	c.FuzzNoCustom(in)
 	// Drop empty structs with only omit empty fields.

api/core/v1beta1/machinehealthcheck_types.go

@@ -69,14 +69,6 @@ type MachineHealthCheckSpec struct {
 	// +kubebuilder:validation:MaxItems=100
 	UnhealthyConditions []UnhealthyCondition `json:"unhealthyConditions,omitempty"`
 
-	// unhealthyMachineConditions contains a list of the machine 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
-	UnhealthyMachineConditions []UnhealthyMachineCondition `json:"unhealthyMachineConditions,omitempty"`
-
 	// maxUnhealthy specifies the maximum number of unhealthy machines allowed.
 	// Any further remediation is only allowed if at most "maxUnhealthy" machines selected by
 	// "selector" are not healthy.
@@ -156,34 +148,6 @@ type UnhealthyCondition struct {
 
 // ANCHOR_END: UnhealthyCondition
 
-// ANCHOR: UnhealthyMachineCondition
-
-// UnhealthyMachineCondition 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 UnhealthyMachineCondition struct {
-	// type of Node condition
-	// +kubebuilder:validation:Type=string
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Type string `json:"type"`
-
-	// status of the condition, one of True, False, Unknown.
-	// +kubebuilder:validation:Type=string
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Status metav1.ConditionStatus `json:"status"`
-
-	// timeout is the duration that a node must be in a given status for,
-	// after which the node is considered unhealthy.
-	// For example, with a value of "1h", the node must match the status
-	// for at least 1 hour before being considered unhealthy.
-	// +required
-	Timeout metav1.Duration `json:"timeout"`
-}
-
-// ANCHOR_END: UnhealthyMachineCondition
-
 // ANCHOR: MachineHealthCheckStatus
 
 // MachineHealthCheckStatus defines the observed state of MachineHealthCheck.

api/core/v1beta1/zz_generated.conversion.go

@@ -385,6 +385,14 @@ type MachineHealthCheckClass struct {
 	// +kubebuilder:validation:MaxItems=100
 	UnhealthyNodeConditions []UnhealthyNodeCondition `json:"unhealthyNodeConditions,omitempty"`
 
+	// unhealthyMachineConditions contains a list of the machine 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
+	UnhealthyMachineConditions []UnhealthyMachineCondition `json:"unhealthyMachineConditions,omitempty"`
+
 	// maxUnhealthy specifies the maximum number of unhealthy machines allowed.
 	// Any further remediation is only allowed if at most "maxUnhealthy" machines selected by
 	// "selector" are not healthy.