Merge pull request #415 from enxebre/drop-strategy-field

Drop strategy field in favour of annotation

Author: enxebre

install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml

@@ -43,10 +43,6 @@ spec:
               - type: integer
               description: Any farther remediation is only allowed if at most "MaxUnhealthy"
                 machines selected by "selector" are not healthy.
-            remediationStrategy:
-              description: RemediationStrategy to use in case of problem detection
-                default is machine deletion
-              type: string
             selector:
               description: Label selector to match machines whose health will be exercised
               properties:

pkg/apis/healthchecking/v1alpha1/machinehealthcheck_types.go

@@ -6,9 +6,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-// ConfigMapNodeUnhealthyConditions contains the name of the unhealthy conditions config map
-const ConfigMapNodeUnhealthyConditions = "node-unhealthy-conditions"
-
 // RemediationStrategyType contains remediation strategy type
 type RemediationStrategyType string
 
@@ -41,11 +38,6 @@ type MachineHealthCheckList struct {
 
 // MachineHealthCheckSpec defines the desired state of MachineHealthCheck
 type MachineHealthCheckSpec struct {
-	// RemediationStrategy to use in case of problem detection
-	// default is machine deletion
-	// +optional
-	RemediationStrategy *RemediationStrategyType `json:"remediationStrategy,omitempty"`
-
 	// Label selector to match machines whose health will be exercised
 	Selector metav1.LabelSelector `json:"selector"`
 

pkg/apis/healthchecking/v1alpha1/zz_generated.deepcopy.go

@@ -28,15 +28,16 @@ import (
 )
 
 const (
-	machineAnnotationKey        = "machine.openshift.io/machine"
-	machineRebootAnnotationKey  = "healthchecking.openshift.io/machine-remediation-reboot"
-	ownerControllerKind         = "MachineSet"
-	nodeMasterLabel             = "node-role.kubernetes.io/master"
-	machineRoleLabel            = "machine.openshift.io/cluster-api-machine-role"
-	machineMasterRole           = "master"
-	machinePhaseFailed          = "Failed"
-	remediationStrategyReboot   = healthcheckingv1alpha1.RemediationStrategyType("reboot")
-	timeoutForMachineToHaveNode = 10 * time.Minute
+	machineAnnotationKey          = "machine.openshift.io/machine"
+	machineRebootAnnotationKey    = "healthchecking.openshift.io/machine-remediation-reboot"
+	ownerControllerKind           = "MachineSet"
+	nodeMasterLabel               = "node-role.kubernetes.io/master"
+	machineRoleLabel              = "machine.openshift.io/cluster-api-machine-role"
+	machineMasterRole             = "master"
+	machinePhaseFailed            = "Failed"
+	remediationStrategyAnnotation = "healthchecking.openshift.io/strategy"
+	remediationStrategyReboot     = healthcheckingv1alpha1.RemediationStrategyType("reboot")
+	timeoutForMachineToHaveNode   = 10 * time.Minute
 )
 
 // Add creates a new MachineHealthCheck Controller and adds it to the Manager. The Manager will set fields on the Controller
@@ -360,9 +361,11 @@ func (t *target) remediate(r *ReconcileMachineHealthCheck) error {
 		return nil
 	}
 
-	remediationStrategy := t.MHC.Spec.RemediationStrategy
-	if remediationStrategy != nil && *remediationStrategy == remediationStrategyReboot {
-		return t.remediationStrategyReboot(r)
+	remediationStrategy, ok := t.MHC.Annotations[remediationStrategyAnnotation]
+	if ok {
+		if healthcheckingv1alpha1.RemediationStrategyType(remediationStrategy) == remediationStrategyReboot {
+			return t.remediationStrategyReboot(r)
+		}
 	}
 	if t.isMaster() {
 		glog.Infof("%s: master node, skipping remediation", t.string())