From a688e348c71ed8a069cac090aacb751e0940b897 Mon Sep 17 00:00:00 2001 From: Gary Brown Date: Thu, 4 Jul 2019 14:58:34 +0100 Subject: [PATCH] Set default redundancy policy to zero (#501) * Set default redundancy policy to zero when node count is 1 Signed-off-by: Gary Brown * Updated to make the general default rather than just based on 1 node count Signed-off-by: Gary Brown --- pkg/strategy/controller.go | 4 ++++ pkg/strategy/controller_test.go | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/strategy/controller.go b/pkg/strategy/controller.go index cdcffb1fd..b2623abb3 100644 --- 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 index 1c89fe575..5f2eb6ac4 100644 --- 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)