Address review comments

Signed-off-by: Furkat Gofurov <[email protected]>

Author: furkatgofurov7

api/core/v1beta1/conversion.go

@@ -73,6 +73,11 @@ func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.Topology.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions = restored.Spec.Topology.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions
+	for i, md := range restored.Spec.Topology.Workers.MachineDeployments {
+		dst.Spec.Topology.Workers.MachineDeployments[i].HealthCheck.Checks.UnhealthyMachineConditions = md.HealthCheck.Checks.UnhealthyMachineConditions
+	}
+
 	// Recover intent for bool values converted to *bool.
 	clusterv1.Convert_bool_To_Pointer_bool(src.Spec.Paused, ok, restored.Spec.Paused, &dst.Spec.Paused)
 
@@ -145,6 +150,11 @@ func (src *ClusterClass) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions = restored.Spec.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions
+	for i, md := range restored.Spec.Workers.MachineDeployments {
+		dst.Spec.Workers.MachineDeployments[i].HealthCheck.Checks.UnhealthyMachineConditions = md.HealthCheck.Checks.UnhealthyMachineConditions
+	}
+
 	// Recover intent for bool values converted to *bool.
 	for i, patch := range dst.Spec.Patches {
 		for j, definition := range patch.Definitions {
@@ -513,6 +523,8 @@ func (src *MachineHealthCheck) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.Checks.UnhealthyMachineConditions = restored.Spec.Checks.UnhealthyMachineConditions
+
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.ExpectedMachines, ok, restored.Status.ExpectedMachines, &dst.Status.ExpectedMachines)
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.CurrentHealthy, ok, restored.Status.CurrentHealthy, &dst.Status.CurrentHealthy)
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.RemediationsAllowed, ok, restored.Status.RemediationsAllowed, &dst.Status.RemediationsAllowed)

api/core/v1beta1/conversion_test.go

@@ -99,7 +99,6 @@ func ClusterFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 		hubClusterVariable,
 		hubFailureDomain,
 		hubUnhealthyNodeCondition,
-		hubUnhealthyMachineCondition,
 		spokeCluster,
 		spokeClusterTopology,
 		spokeObjectReference,
@@ -127,17 +126,6 @@ func hubClusterSpec(in *clusterv1.ClusterSpec, c randfill.Continue) {
 		in.ControlPlaneRef.APIGroup = gvk.Group
 		in.ControlPlaneRef.Kind = gvk.Kind
 	}
-
-	// remove MachineHealthCheck.UnhealthyMachineConditions as it does not exist in v1beta1.
-	if in.Topology.IsDefined() && in.Topology.ControlPlane.HealthCheck.IsDefined() {
-		in.Topology.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions = nil
-	}
-
-	if in.Topology.IsDefined() && len(in.Topology.Workers.MachineDeployments) > 0 {
-		for i := range in.Topology.Workers.MachineDeployments {
-			in.Topology.Workers.MachineDeployments[i].HealthCheck.Checks.UnhealthyMachineConditions = nil
-		}
-	}
 }
 
 func hubClusterStatus(in *clusterv1.ClusterStatus, c randfill.Continue) {
@@ -189,14 +177,6 @@ func hubUnhealthyNodeCondition(in *clusterv1.UnhealthyNodeCondition, c randfill.
 	}
 }
 
-func hubUnhealthyMachineCondition(in *clusterv1.UnhealthyMachineCondition, c randfill.Continue) {
-	c.FillNoCustom(in)
-
-	if in.TimeoutSeconds == nil {
-		in.TimeoutSeconds = ptr.To(int32(0)) // TimeoutSeconds is a required field and nil does not round trip
-	}
-}
-
 func spokeCluster(in *Cluster, c randfill.Continue) {
 	c.FillNoCustom(in)
 
@@ -287,14 +267,12 @@ func spokeClusterVariable(in *ClusterVariable, c randfill.Continue) {
 
 func ClusterClassFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
-		hubClusterClassSpec,
 		hubClusterClassVariable,
 		hubClusterClassStatusVariableDefinition,
 		hubClusterClassStatus,
 		hubJSONPatch,
 		hubJSONSchemaProps,
 		hubUnhealthyNodeCondition,
-		hubUnhealthyMachineCondition,
 		spokeClusterClass,
 		spokeObjectReference,
 		spokeClusterClassStatus,
@@ -309,21 +287,6 @@ func ClusterClassFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	}
 }
 
-func hubClusterClassSpec(in *clusterv1.ClusterClassSpec, c randfill.Continue) {
-	c.FillNoCustom(in)
-
-	// remove MachineHealthCheck.UnhealthyMachineConditions as it does not exist in v1beta1.
-	if in.ControlPlane.HealthCheck.IsDefined() && in.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions != nil {
-		in.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions = nil
-	}
-
-	if len(in.Workers.MachineDeployments) > 0 {
-		for i := range in.Workers.MachineDeployments {
-			in.Workers.MachineDeployments[i].HealthCheck.Checks.UnhealthyMachineConditions = nil
-		}
-	}
-}
-
 func hubClusterClassVariable(in *clusterv1.ClusterClassVariable, c randfill.Continue) {
 	c.FillNoCustom(in)
 
@@ -765,9 +728,7 @@ func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c randfill.Contin
 func MachineHealthCheckFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		hubUnhealthyNodeCondition,
-		hubUnhealthyMachineCondition,
 		hubMachineHealthCheckStatus,
-		hubMachineHealthCheckSpec,
 		spokeMachineHealthCheck,
 		spokeMachineHealthCheckSpec,
 		spokeObjectReference,
@@ -776,14 +737,6 @@ func MachineHealthCheckFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{}
 	}
 }
 
-func hubMachineHealthCheckSpec(in *clusterv1.MachineHealthCheckSpec, c randfill.Continue) {
-	c.FillNoCustom(in)
-
-	if in.Checks.UnhealthyMachineConditions != nil {
-		in.Checks.UnhealthyMachineConditions = nil
-	}
-}
-
 func hubMachineHealthCheckStatus(in *clusterv1.MachineHealthCheckStatus, c randfill.Continue) {
 	c.FillNoCustom(in)
 	// Drop empty structs with only omit empty fields.

api/core/v1beta2/machinehealthcheck_types.go

@@ -237,7 +237,7 @@ type UnhealthyNodeCondition struct {
 
 	// timeoutSeconds 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 example, with a value of "3600", the node must match the status
 	// for at least 1 hour before being considered unhealthy.
 	// +required
 	// +kubebuilder:validation:Minimum=0
@@ -249,7 +249,7 @@ type UnhealthyNodeCondition struct {
 // status for at least the timeout value, a machine is considered unhealthy.
 type UnhealthyMachineCondition struct {
 	// type of Machine condition
-	// +kubebuilder:validation:Type=string
+	// +kubebuilder:validation:Pattern=`^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$`
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=316
 	// +required
@@ -262,7 +262,7 @@ type UnhealthyMachineCondition struct {
 
 	// timeoutSeconds is the duration that a machine must be in a given status for,
 	// after which the machine is considered unhealthy.
-	// For example, with a value of "1h", the machine must match the status
+	// For example, with a value of "3600", the machine must match the status
 	// for at least 1 hour before being considered unhealthy.
 	// +required
 	// +kubebuilder:validation:Minimum=0

api/core/v1beta2/zz_generated.openapi.go

@@ -98,6 +98,13 @@ func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
 	if err != nil {
 		return err
 	}
+	// Recover unhealthyMachineConditions for control plane and machine deployments
+	dst.Spec.Topology.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions = restored.Spec.Topology.ControlPlane.HealthCheck.Checks.UnhealthyMachineConditions
+	for i, md := range restored.Spec.Topology.Workers.MachineDeployments {
+		if i < len(dst.Spec.Topology.Workers.MachineDeployments) {
+			dst.Spec.Topology.Workers.MachineDeployments[i].HealthCheck.Checks.UnhealthyMachineConditions = md.HealthCheck.Checks.UnhealthyMachineConditions
+		}
+	}
 
 	// Recover intent for bool values converted to *bool.
 	clusterv1.Convert_bool_To_Pointer_bool(src.Spec.Paused, ok, restored.Spec.Paused, &dst.Spec.Paused)
@@ -503,6 +510,8 @@ func (src *MachineHealthCheck) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.Checks.UnhealthyMachineConditions = restored.Spec.Checks.UnhealthyMachineConditions
+
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.ExpectedMachines, ok, restored.Status.ExpectedMachines, &dst.Status.ExpectedMachines)
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.CurrentHealthy, ok, restored.Status.CurrentHealthy, &dst.Status.CurrentHealthy)
 	clusterv1.Convert_int32_To_Pointer_int32(src.Status.RemediationsAllowed, ok, restored.Status.RemediationsAllowed, &dst.Status.RemediationsAllowed)