Address review comments (Stefan)

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

Author: furkatgofurov7

api/core/v1beta2/machinehealthcheck_types.go

@@ -252,7 +252,7 @@ type UnhealthyMachineCondition struct {
 	// +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
-	// +kubebuilder:validation:XValidation:rule="self != 'Ready' && self != 'Available' && self != 'HealthCheckSucceeded' && self != 'OwnerRemediated' && self != 'ExternallyRemediated'",message="type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated"
+	// +kubebuilder:validation:XValidation:rule="!(self in ['Ready','Available','HealthCheckSucceeded','OwnerRemediated','ExternallyRemediated'])",message="type must not be one of: Ready, Available, HealthCheckSucceeded, OwnerRemediated, ExternallyRemediated"
 	// +required
 	Type string `json:"type,omitempty"`
 

config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml

@@ -45,9 +45,6 @@ const (
 
 	// EventMachineMarkedUnhealthy is emitted when machine was successfully marked as unhealthy.
 	EventMachineMarkedUnhealthy string = "MachineMarkedUnhealthy"
-	// EventDetectedUnhealthy is emitted in case a machine or its associated
-	// node was detected unhealthy.
-	EventDetectedUnhealthy string = "DetectedUnhealthy"
 )
 
 var (

config/crd/bases/cluster.x-k8s.io_clusters.yaml

@@ -709,10 +709,6 @@ func newTestUnhealthyMachine(name, namespace, clusterName, nodeName string, labe
 
 	bootstrap := "bootstrap"
 	return &clusterv1.Machine{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: clusterv1.GroupVersion.String(),
-			Kind:       "Machine",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,

config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml

@@ -127,10 +127,10 @@ spec:
             status: "False"
             timeoutSeconds: 300
         unhealthyMachineConditions:
-          - type: "Ready"
+          - type: "NodeReady"
             status: Unknown
             timeoutSeconds: 300
-          - type: "Ready"
+          - type: "NodeReady"
             status: "False"
             timeoutSeconds: 300
   infrastructure:
@@ -161,9 +161,9 @@ spec:
                 status: "False"
                 timeoutSeconds: 300
             unhealthyMachineConditions:
-              - type: "Ready"
+              - type: "NodeReady"
                 status: Unknown
                 timeoutSeconds: 300
-              - type: "Ready"
+              - type: "NodeReady"
                 status: "False"
                 timeoutSeconds: 300

internal/controllers/machinehealthcheck/machinehealthcheck_targets.go

@@ -23,10 +23,10 @@ spec:
             status: "False"
             timeoutSeconds: 300
         unhealthyMachineConditions:
-          - type: "Ready"
+          - type: "NodeReady"
             status: Unknown
             timeoutSeconds: 300
-          - type: "Ready"
+          - type: "NodeReady"
             status: "False"
             timeoutSeconds: 300
   infrastructure:
@@ -57,10 +57,10 @@ spec:
               status: "False"
               timeoutSeconds: 300
           unhealthyMachineConditions:
-            - type: "Ready"
+            - type: "NodeReady"
               status: Unknown
               timeoutSeconds: 300
-            - type: "Ready"
+            - type: "NodeReady"
               status: "False"
               timeoutSeconds: 300
     machinePools: