Merge pull request #425 from enxebre/fix-1764092

openshift-merge-robot · web-flow · commit cea6ea191e51 · 2019-10-22T17:38:32.000+02:00
bug 1764092: fix typo logging
diff --git a/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go b/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
@@ -170,11 +170,11 @@ func isAllowedRemediation(mhc *healthcheckingv1alpha1.MachineHealthCheck) bool {
 	}
 	maxUnhealthy, err := intstr.GetValueFromIntOrPercent(mhc.Spec.MaxUnhealthy, mhc.Status.ExpectedMachines, false)
 	if err != nil {
-		glog.Errorf("%s: error decoding maxUnavailable, remediation won't be allowed: %v", namespacedName(mhc), err)
+		glog.Errorf("%s: error decoding maxUnhealthy, remediation won't be allowed: %v", namespacedName(mhc), err)
 		return false
 	}
 
-	// if noHealthy are above MaxUnavailable we short circuit any farther remediation
+	// if noHealthy are above maxUnhealthy we short circuit any farther remediation
 	noHealthy := mhc.Status.ExpectedMachines - mhc.Status.CurrentHealthy
 	return (maxUnhealthy - noHealthy) >= 0
 }

Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,11 @@ func isAllowedRemediation(mhc *healthcheckingv1alpha1.MachineHealthCheck) bool {`
`170`	`170`	`}`
`171`	`171`	`maxUnhealthy, err := intstr.GetValueFromIntOrPercent(mhc.Spec.MaxUnhealthy, mhc.Status.ExpectedMachines, false)`
`172`	`172`	`if err != nil {`
`173`		`- glog.Errorf("%s: error decoding maxUnavailable, remediation won't be allowed: %v", namespacedName(mhc), err)`
	`173`	`+ glog.Errorf("%s: error decoding maxUnhealthy, remediation won't be allowed: %v", namespacedName(mhc), err)`
`174`	`174`	`return false`
`175`	`175`	`}`
`176`	`176`
`177`		`- // if noHealthy are above MaxUnavailable we short circuit any farther remediation`
	`177`	`+ // if noHealthy are above maxUnhealthy we short circuit any farther remediation`
`178`	`178`	`noHealthy := mhc.Status.ExpectedMachines - mhc.Status.CurrentHealthy`
`179`	`179`	`return (maxUnhealthy - noHealthy) >= 0`
`180`	`180`	`}`