Allow override es.archive.tls

Signed-off-by: Ruben Vargas <[email protected]>
jaegertracing · Jan 16, 2020 · 93df3af · 93df3af
1 parent 233cfd4
commit 93df3af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/inject/oauth_proxy.go b/pkg/inject/oauth_proxy.go
@@ -39,7 +39,7 @@ func OAuthProxy(jaeger *v1.Jaeger, dep *appsv1.Deployment) *appsv1.Deployment {
 func proxyInitArguments(jaeger *v1.Jaeger) []string {
 	secret, err := util.GenerateProxySecret()
 	if err != nil {
-		jaeger.Logger().Warnf("Error generating secret: %s, fallback to fixed secret", secret)
+		jaeger.Logger().WithError(err).Warnf("Error generating secret: %s, fallback to fixed secret", secret)
 		secret = defaultProxySecret
 	}
 	args := []string{

diff --git a/pkg/storage/elasticsearch.go b/pkg/storage/elasticsearch.go
@@ -65,7 +65,11 @@ func (ed *ElasticsearchDeployment) injectArguments(container *corev1.Container)
 	if strings.EqualFold(util.FindItem("--es-archive.enabled", container.Args), "--es-archive.enabled=true") {
 		container.Args = append(container.Args,
 			"--es-archive.server-urls="+elasticsearchURL,
-			"--es-archive.tls=true",
+		)
+		if util.FindItem("--es-archive.tls=", container.Args) == "" {
+			container.Args = append(container.Args, "--es-archive.tls=true")
+		}
+		container.Args = append(container.Args,
 			"--es-archive.tls.ca="+caPath,
 			"--es-archive.tls.cert="+certPath,
 			"--es-archive.tls.key="+keyPath,