Set default redundancy policy to zero (#501)

* Set default redundancy policy to zero when node count is 1 Signed-off-by: Gary Brown <[email protected]> * Updated to make the general default rather than just based on 1 node count Signed-off-by: Gary Brown <[email protected]>
jaegertracing · Jul 4, 2019 · a688e34 · a688e34
1 parent 01bb012
commit a688e34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/strategy/controller.go b/pkg/strategy/controller.go
@@ -12,6 +12,7 @@ import (
 	"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/cronjob"
 	"github.com/jaegertracing/jaeger-operator/pkg/storage"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 const (
@@ -143,6 +144,9 @@ func normalizeElasticsearch(spec *v1.ElasticsearchSpec) {
 	if spec.NodeCount == 0 {
 		spec.NodeCount = 1
 	}
+	if spec.RedundancyPolicy == "" {
+		spec.RedundancyPolicy = esv1.ZeroRedundancy
+	}
 }
 
 func normalizeRollover(spec *v1.JaegerEsRolloverSpec) {

diff --git a/pkg/strategy/controller_test.go b/pkg/strategy/controller_test.go
@@ -243,9 +243,11 @@ func TestNormalizeElasticsearch(t *testing.T) {
 		expected  v1.ElasticsearchSpec
 	}{
 		{underTest: v1.ElasticsearchSpec{},
-			expected: v1.ElasticsearchSpec{NodeCount: 1}},
-		{underTest: v1.ElasticsearchSpec{Image: "bla", NodeCount: 150},
-			expected: v1.ElasticsearchSpec{Image: "bla", NodeCount: 150}},
+			expected: v1.ElasticsearchSpec{NodeCount: 1, RedundancyPolicy: "ZeroRedundancy"}},
+		{underTest: v1.ElasticsearchSpec{NodeCount: 3, RedundancyPolicy: "FullRedundancy"},
+			expected: v1.ElasticsearchSpec{NodeCount: 3, RedundancyPolicy: "FullRedundancy"}},
+		{underTest: v1.ElasticsearchSpec{Image: "bla", NodeCount: 150, RedundancyPolicy: "ZeroRedundancy"},
+			expected: v1.ElasticsearchSpec{Image: "bla", NodeCount: 150, RedundancyPolicy: "ZeroRedundancy"}},
 	}
 	for _, test := range tests {
 		normalizeElasticsearch(&test.underTest)