Replaced use of strings.ToLower comparison with EqualFold

pkg/deployment/agent.go

@@ -31,7 +31,7 @@ func NewAgent(jaeger *v1alpha1.Jaeger) *Agent {
 
 // Get returns a Agent pod
 func (a *Agent) Get() *appsv1.DaemonSet {
-	if strings.ToLower(a.jaeger.Spec.Agent.Strategy) != "daemonset" {
+	if !strings.EqualFold(a.jaeger.Spec.Agent.Strategy, "daemonset") {
 		logrus.Debugf(
 			"The Jaeger instance '%v' is using a Sidecar strategy for the Jaeger Agent. Skipping its DaemonSet deployment.",
 			a.jaeger.Name,

pkg/ingress/query.go

@@ -38,9 +38,9 @@ func (i *QueryIngress) Get() *v1beta1.Ingress {
 		ServiceName: service.GetNameForQueryService(i.jaeger),
 		ServicePort: intstr.FromInt(service.GetPortForQueryService(i.jaeger)),
 	}
-	if _, ok := i.jaeger.Spec.AllInOne.Options.Map()["query.base-path"]; ok && strings.ToLower(i.jaeger.Spec.Strategy) == "allinone" {
+	if _, ok := i.jaeger.Spec.AllInOne.Options.Map()["query.base-path"]; ok && strings.EqualFold(i.jaeger.Spec.Strategy, "allinone") {
 		spec.Rules = append(spec.Rules, getRule(i.jaeger.Spec.AllInOne.Options, backend))
-	} else if _, ok := i.jaeger.Spec.Query.Options.Map()["query.base-path"]; ok && strings.ToLower(i.jaeger.Spec.Strategy) == "production" {
+	} else if _, ok := i.jaeger.Spec.Query.Options.Map()["query.base-path"]; ok && strings.EqualFold(i.jaeger.Spec.Strategy, "production") {
 		spec.Rules = append(spec.Rules, getRule(i.jaeger.Spec.Query.Options, backend))
 	} else {
 		spec.Backend = &backend

pkg/inject/sidecar.go

@@ -57,7 +57,7 @@ func Needed(dep *appsv1.Deployment) bool {
 // Select a suitable Jaeger from the JaegerList for the given Pod, or nil of none is suitable
 func Select(target *appsv1.Deployment, availableJaegerPods *v1alpha1.JaegerList) *v1alpha1.Jaeger {
 	jaegerName := target.Annotations[Annotation]
-	if strings.ToLower(jaegerName) == "true" && len(availableJaegerPods.Items) == 1 {
+	if strings.EqualFold(jaegerName, "true") && len(availableJaegerPods.Items) == 1 {
 		// if there's only *one* jaeger within this namespace, then that's what
 		// we'll use -- otherwise, we should just not inject, as it's not clear which
 		// jaeger instance to use!

pkg/storage/dependency.go

@@ -10,7 +10,7 @@ import (
 
 // Dependencies return a list of Jobs that have to be finished before the other components are deployed
 func Dependencies(jaeger *v1alpha1.Jaeger) []batchv1.Job {
-	if strings.ToLower(jaeger.Spec.Storage.Type) == "cassandra" {
+	if strings.EqualFold(jaeger.Spec.Storage.Type, "cassandra") {
 		return cassandraDeps(jaeger)
 	}
 

pkg/storage/types.go

@@ -16,7 +16,7 @@ func ValidTypes() []string {
 
 // OptionsPrefix returns the options prefix associated with the supplied storage type
 func OptionsPrefix(storageType string) string {
-	if strings.ToLower(storageType) == "elasticsearch" {
+	if strings.EqualFold(storageType, "elasticsearch") {
 		return "es"
 	}
 	return storageType

pkg/strategy/all-in-one.go

@@ -89,7 +89,7 @@ func (c *allInOneStrategy) Create() []runtime.Object {
 	}
 
 	if isBoolTrue(c.jaeger.Spec.Storage.EsIndexCleaner.Enabled) {
-		if strings.ToLower(c.jaeger.Spec.Storage.Type) == "elasticsearch" {
+		if strings.EqualFold(c.jaeger.Spec.Storage.Type, "elasticsearch") {
 			os = append(os, cronjob.CreateEsIndexCleaner(c.jaeger))
 		} else {
 			logrus.WithField("type", c.jaeger.Spec.Storage.Type).Warn("Skipping Elasticsearch index cleaner job due to unsupported storage.")

pkg/strategy/controller.go

@@ -24,19 +24,19 @@ type S interface {
 
 // For returns the appropriate Strategy for the given Jaeger instance
 func For(ctx context.Context, jaeger *v1alpha1.Jaeger) S {
-	if strings.ToLower(jaeger.Spec.Strategy) == "all-in-one" {
+	if strings.EqualFold(jaeger.Spec.Strategy, "all-in-one") {
 		logrus.Warnf("Strategy 'all-in-one' is no longer supported, please use 'allInOne'")
 		jaeger.Spec.Strategy = "allInOne"
 	}
 
 	normalize(jaeger)
 
 	logrus.Debugf("Jaeger strategy: %s", jaeger.Spec.Strategy)
-	if strings.ToLower(jaeger.Spec.Strategy) == "allinone" {
+	if strings.EqualFold(jaeger.Spec.Strategy, "allinone") {
 		return newAllInOneStrategy(ctx, jaeger)
 	}
 
-	if strings.ToLower(jaeger.Spec.Strategy) == "streaming" {
+	if strings.EqualFold(jaeger.Spec.Strategy, "streaming") {
 		return newStreamingStrategy(ctx, jaeger)
 	}
 
@@ -69,13 +69,13 @@ func normalize(jaeger *v1alpha1.Jaeger) {
 	}
 
 	// normalize the deployment strategy
-	if strings.ToLower(jaeger.Spec.Strategy) != "production" && strings.ToLower(jaeger.Spec.Strategy) != "streaming" {
+	if !strings.EqualFold(jaeger.Spec.Strategy, "production") && !strings.EqualFold(jaeger.Spec.Strategy, "streaming") {
 		jaeger.Spec.Strategy = "allInOne"
 	}
 
 	// check for incompatible options
 	// if the storage is `memory`, then the only possible strategy is `all-in-one`
-	if strings.ToLower(jaeger.Spec.Storage.Type) == "memory" && strings.ToLower(jaeger.Spec.Strategy) != "allinone" {
+	if strings.EqualFold(jaeger.Spec.Storage.Type, "memory") && !strings.EqualFold(jaeger.Spec.Strategy, "allinone") {
 		logrus.Warnf(
 			"No suitable storage was provided for the Jaeger instance '%v'. Falling back to all-in-one. Storage type: '%v'",
 			jaeger.Name,
@@ -131,7 +131,7 @@ func normalizeIndexCleaner(spec *v1alpha1.JaegerEsIndexCleanerSpec, storage stri
 
 func unknownStorage(typ string) bool {
 	for _, k := range storage.ValidTypes() {
-		if strings.ToLower(typ) == k {
+		if strings.EqualFold(typ, k) {
 			return false
 		}
 	}

pkg/strategy/production.go

@@ -95,7 +95,7 @@ func (c *productionStrategy) Create() []runtime.Object {
 	}
 
 	if isBoolTrue(c.jaeger.Spec.Storage.EsIndexCleaner.Enabled) {
-		if strings.ToLower(c.jaeger.Spec.Storage.Type) == "elasticsearch" {
+		if strings.EqualFold(c.jaeger.Spec.Storage.Type, "elasticsearch") {
 			os = append(os, cronjob.CreateEsIndexCleaner(c.jaeger))
 		} else {
 			logrus.WithField("type", c.jaeger.Spec.Storage.Type).Warn("Skipping Elasticsearch index cleaner job due to unsupported storage.")

pkg/strategy/streaming.go

@@ -107,7 +107,7 @@ func (c *streamingStrategy) Create() []runtime.Object {
 	}
 
 	if isBoolTrue(c.jaeger.Spec.Storage.EsIndexCleaner.Enabled) {
-		if strings.ToLower(c.jaeger.Spec.Storage.Type) == "elasticsearch" {
+		if strings.EqualFold(c.jaeger.Spec.Storage.Type, "elasticsearch") {
 			os = append(os, cronjob.CreateEsIndexCleaner(c.jaeger))
 		} else {
 			logrus.WithField("type", c.jaeger.Spec.Storage.Type).Warn("Skipping Elasticsearch index cleaner job due to unsupported storage.")