Merge pull request #353 from cynepco3hahue/mhc_rs_optional

Make remediation strategy optional parameter

Author: openshift-merge-robot

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

@@ -40,7 +40,6 @@ spec:
               description: Label selector to match machines whose health will be exercised
               type: object
           required:
-          - remediationStrategy
           - selector
           type: object
         status:

pkg/apis/healthchecking/v1alpha1/machinehealthcheck_types.go

@@ -7,6 +7,7 @@ import (
 // ConfigMapNodeUnhealthyConditions contains the name of the unhealthy conditions config map
 const ConfigMapNodeUnhealthyConditions = "node-unhealthy-conditions"
 
+// RemediationStrategyType contains remediation strategy type
 type RemediationStrategyType string
 
 // +genclient
@@ -40,7 +41,8 @@ type MachineHealthCheckList struct {
 type MachineHealthCheckSpec struct {
 	// RemediationStrategy to use in case of problem detection
 	// default is machine deletion
-	RemediationStrategy RemediationStrategyType `json:"remediationStrategy"`
+	// +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

@@ -155,7 +155,7 @@ func getMachineHealthCheckListOptions() *client.ListOptions {
 	}
 }
 
-func remediate(r *ReconcileMachineHealthCheck, remediationStrategy healthcheckingv1alpha1.RemediationStrategyType, machine *mapiv1.Machine) (reconcile.Result, error) {
+func remediate(r *ReconcileMachineHealthCheck, remediationStrategy *healthcheckingv1alpha1.RemediationStrategyType, machine *mapiv1.Machine) (reconcile.Result, error) {
 	glog.Infof("Initialising remediation logic for machine %s", machine.Name)
 	if !hasMachineSetOwner(*machine) {
 		glog.Infof("Machine %s has no machineSet controller owner, skipping remediation", machine.Name)
@@ -200,10 +200,9 @@ func remediate(r *ReconcileMachineHealthCheck, remediationStrategy healthcheckin
 		// apply remediation logic, if at least one condition last more than specified timeout
 		// specific remediation logic goes here
 		if unhealthyForTooLong(nodeCondition, conditionTimeout) {
-			switch remediationStrategy {
-			case remediationStrategyReboot:
+			if remediationStrategy != nil && *remediationStrategy == remediationStrategyReboot {
 				return r.remediationStrategyReboot(machine, node)
-			default:
+			} else {
 				if isMaster(*machine, r.client) {
 					glog.Infof("The machine %s is a master node, skipping remediation", machine.Name)
 					return reconcile.Result{}, nil

pkg/controller/machinehealthcheck/machinehealthcheck_controller.go

@@ -247,7 +247,7 @@ func testReconcile(t *testing.T, remediationWaitTime time.Duration, initObjects
 	}
 
 	for _, tc := range testsCases {
-		machineHealthCheck.Spec.RemediationStrategy = tc.remediationStrategy
+		machineHealthCheck.Spec.RemediationStrategy = &tc.remediationStrategy
 		objects := []runtime.Object{}
 		objects = append(objects, initObjects...)
 		objects = append(objects, machineHealthCheck)