Merge pull request #155 from zimnx/mz/cpuset-fix

zimnx · web-flow · commit 9d4d3d954a03 · 2020-07-20T16:56:42.000+02:00
operator: correct resource validation when cpuset is used
diff --git a/pkg/api/v1alpha1/cluster_validation.go b/pkg/api/v1alpha1/cluster_validation.go
@@ -41,7 +41,6 @@ func checkValues(c *Cluster) error {
 				if requests.Memory().MilliValue() != limits.Memory().MilliValue() {
 					return errors.Errorf("when using cpuset, memory requests must be the same as memory limits in rack %s", rack.Name)
 				}
-				return errors.Errorf("when using cpuset, requests must be the same as limits in rack %s", rack.Name)
 			} else {
 				// Copy the limits
 				rack.Resources.Requests = limits.DeepCopy()

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ func checkValues(c *Cluster) error {`
`41`	`41`	`if requests.Memory().MilliValue() != limits.Memory().MilliValue() {`
`42`	`42`	`return errors.Errorf("when using cpuset, memory requests must be the same as memory limits in rack %s", rack.Name)`
`43`	`43`	`}`
`44`		`- return errors.Errorf("when using cpuset, requests must be the same as limits in rack %s", rack.Name)`
`45`	`44`	`} else {`
`46`	`45`	`// Copy the limits`
`47`	`46`	`rack.Resources.Requests = limits.DeepCopy()`