Added test. Added helper functions. Updated documentation.

Author: lamai93

docs/Manual/Deployment/Kubernetes/DeploymentResource.md

@@ -352,6 +352,14 @@ for `spec.mode: Single` and `2` for `spec.mode: ActiveFailover`).
 For the `syncworkers` group, it is highly recommended to use the same number
 as for the `dbservers` group.
 
+### `spec.<group>.minCount: number`
+
+Specifies a minimum for the count of servers. If set, a specification is invalid if `count < minCount`.
+
+### `spec.<group>.maxCount: number`
+
+Specifies a maximum for the count of servers. If set, a specification is invalid if `count > maxCount`.
+
 ### `spec.<group>.args: []string`
 
 This setting specifies additional commandline arguments passed to all servers of this group.

pkg/apis/deployment/v1alpha/server_group_spec.go

@@ -23,6 +23,7 @@
 package v1alpha
 
 import (
+	"math"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -62,6 +63,22 @@ func (s ServerGroupSpec) GetCount() int {
 	return util.IntOrDefault(s.Count)
 }
 
+// GetMinCount returns MinCount or 1 if not set
+func (s ServerGroupSpec) GetMinCount() int {
+	if s.MinCount != nil {
+		return *s.MinCount
+	}
+	return 1
+}
+
+// GetMaxCount returns MaxCount or
+func (s ServerGroupSpec) GetMaxCount() int {
+	if s.MaxCount != nil {
+		return *s.MaxCount
+	}
+	return math.MaxInt32
+}
+
 // GetNodeSelector returns the selectors for nodes of this group
 func (s ServerGroupSpec) GetNodeSelector() map[string]string {
 	return s.NodeSelector
@@ -114,24 +131,11 @@ func (s ServerGroupSpec) Validate(group ServerGroup, used bool, mode DeploymentM
 				minCount = 2
 			}
 		}
-		var specMinCount int
-		if s.MinCount != nil {
-			specMinCount = *s.MinCount
-			if specMinCount < 1 {
-				return maskAny(errors.Wrapf(ValidationError, "Invalid minCount: %d < 1", specMinCount))
-			}
-			if s.GetCount() < specMinCount {
-				return maskAny(errors.Wrapf(ValidationError, "Invalid count value %d. Expected >= %d", s.GetCount(), specMinCount))
-			}
+		if s.GetCount() < s.GetMinCount() {
+			return maskAny(errors.Wrapf(ValidationError, "Invalid count value %d. Expected >= %d", s.GetCount(), s.GetMinCount()))
 		}
-		if s.MaxCount != nil {
-			specMaxCount := *s.MaxCount
-			if specMaxCount < specMinCount {
-				return maskAny(errors.Wrapf(ValidationError, "Invalid maxCount: (maxCount) %d < %d (minCount)", specMaxCount, specMinCount))
-			}
-			if s.GetCount() > specMaxCount {
-				return maskAny(errors.Wrapf(ValidationError, "Invalid count value %d. Expected <= %d", s.GetCount(), specMaxCount))
-			}
+		if s.GetCount() > s.GetMaxCount() {
+			return maskAny(errors.Wrapf(ValidationError, "Invalid count value %d. Expected <= %d", s.GetCount(), s.GetMaxCount()))
 		}
 		if s.GetCount() < minCount {
 			return maskAny(errors.Wrapf(ValidationError, "Invalid count value %d. Expected >= %d (implicit minimum; by deployment mode)", s.GetCount(), minCount))

pkg/apis/deployment/v1alpha/server_group_spec_test.go

@@ -51,6 +51,7 @@ func TestServerGroupSpecValidateCount(t *testing.T) {
 	assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2), MinCount: util.NewInt(2), MaxCount: util.NewInt(5)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
 	assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1), MaxCount: util.NewInt(5)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
 	assert.Nil(t, ServerGroupSpec{Count: util.NewInt(6), MinCount: util.NewInt(2)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
+	assert.Nil(t, ServerGroupSpec{Count: util.NewInt(5), MinCount: util.NewInt(5), MaxCount: util.NewInt(5)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
 	assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
 
 	// Invalid