Use to lower

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Dec 7, 2018 · f0279e0 · f0279e0
1 parent e80fd5c
commit f0279e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pkg/cronjob/spark_dependencies.go b/pkg/cronjob/spark_dependencies.go
@@ -3,6 +3,7 @@ package cronjob
 import (
 	"fmt"
 	"strconv"
+	"strings"
 
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
@@ -16,7 +17,7 @@ import (
 var supportedStorageTypes = map[string]bool{"elasticsearch": true, "cassandra": true}
 
 func SupportedStorage(storage string) bool {
-	return supportedStorageTypes[storage]
+	return supportedStorageTypes[strings.ToLower(storage)]
 }
 
 func CreateSparkDependencies(jaeger *v1alpha1.Jaeger) *batchv1beta1.CronJob {

diff --git a/pkg/strategy/all-in-one.go b/pkg/strategy/all-in-one.go
@@ -2,6 +2,7 @@ package strategy
 
 import (
 	"context"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -88,7 +89,7 @@ func (c *allInOneStrategy) Create() []runtime.Object {
 	}
 
 	if isBoolTrue(c.jaeger.Spec.Storage.EsIndexCleaner.Enabled) {
-		if c.jaeger.Spec.Storage.Type == "elasticsearch" {
+		if strings.ToLower(c.jaeger.Spec.Storage.Type) == "elasticsearch" {
 			os = append(os, cronjob.CreateEsIndexCleaner(c.jaeger))
 		} else {
 			logrus.WithField("type", c.jaeger.Spec.Storage.Type).Warn("Elasticsearch index cleaner is enabled for unsupported storage")

diff --git a/pkg/strategy/production.go b/pkg/strategy/production.go
@@ -2,6 +2,7 @@ package strategy
 
 import (
 	"context"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -94,7 +95,7 @@ func (c *productionStrategy) Create() []runtime.Object {
 	}
 
 	if isBoolTrue(c.jaeger.Spec.Storage.EsIndexCleaner.Enabled) {
-		if c.jaeger.Spec.Storage.Type == "elasticsearch" {
+		if strings.ToLower(c.jaeger.Spec.Storage.Type) == "elasticsearch" {
 			os = append(os, cronjob.CreateEsIndexCleaner(c.jaeger))
 		} else {
 			logrus.WithField("type", c.jaeger.Spec.Storage.Type).Warn("Elasticsearch index cleaner is enabled for unsupported storage")