From 93df3af9b49a0c3705222b254ed22025eb1a469a Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Thu, 16 Jan 2020 15:29:35 -0600 Subject: [PATCH] Allow override es.archive.tls Signed-off-by: Ruben Vargas --- pkg/inject/oauth_proxy.go | 2 +- pkg/storage/elasticsearch.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/inject/oauth_proxy.go b/pkg/inject/oauth_proxy.go index c77152a88..2b9e60547 100644 --- 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 index f1ad3602f..7d5699031 100644 --- 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,