From 796f4d776fc5936190b59ff3899c2f3f1845d6ff Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Thu, 20 Feb 2025 11:27:37 -0600 Subject: [PATCH] Fix metrics TLS certificate parameters (#1128) Signed-off-by: Ruben Vargas --- .../tempo-operator.clusterserviceversion.yaml | 2 +- .../tempo-operator.clusterserviceversion.yaml | 5 ++--- cmd/start/main.go | 14 ++++++++++---- .../overlays/openshift/patch_tls_metrics_args.yaml | 6 +----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index 7495c05d5..fee2d91c0 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,7 +74,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.15.1 - createdAt: "2025-02-17T13:21:50Z" + createdAt: "2025-02-20T06:15:35Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index 11065ea64..f60e7ba7e 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,7 +74,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.15.1 - createdAt: "2025-02-17T13:21:48Z" + createdAt: "2025-02-20T06:15:33Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -1516,8 +1516,7 @@ spec: - --zap-log-level=info - start - --config=controller_manager_config.yaml - - --metrics-tls-private-key-file=/var/run/tls/server/tls.key - - --metrics-tls-cert-file=/var/run/tls/server/tls.crt + - --metrics-tls-cert-dir=/var/run/tls/server/ env: - name: RELATED_IMAGE_TEMPO value: docker.io/grafana/tempo:2.7.1 diff --git a/cmd/start/main.go b/cmd/start/main.go index 1c5819e72..4984c17b4 100644 --- a/cmd/start/main.go +++ b/cmd/start/main.go @@ -32,8 +32,13 @@ func start(c *cobra.Command, args []string) { version := version.Get() options.PprofBindAddress, _ = c.Flags().GetString("pprof-addr") - options.Metrics.CertName, _ = c.Flags().GetString("metrics-tls-cert-file") - options.Metrics.KeyName, _ = c.Flags().GetString("metrics-tls-private-key-file") + + certDir, _ := c.Flags().GetString("metrics-tls-cert-dir") + if certDir != "" { + options.Metrics.CertDir = certDir + options.Metrics.CertName, _ = c.Flags().GetString("metrics-tls-cert-file") + options.Metrics.KeyName, _ = c.Flags().GetString("metrics-tls-private-key-file") + } mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options) if err != nil { @@ -162,7 +167,8 @@ func NewStartCommand() *cobra.Command { Run: start, } cmd.Flags().String("pprof-addr", "", "The address the pprof server binds to. Default is empty string which disables the pprof server.") - cmd.Flags().String("metrics-tls-cert-file", "", "TLS certificate used by metrics server") - cmd.Flags().String("metrics-tls-private-key-file", "", "TLS key used by metrics server") + cmd.Flags().String("metrics-tls-cert-dir", "", "TLS certificate used by metrics server") + cmd.Flags().String("metrics-tls-cert-file", "tls.crt", "TLS certificate used by metrics server") + cmd.Flags().String("metrics-tls-private-key-file", "tls.key", "TLS key used by metrics server") return cmd } diff --git a/config/overlays/openshift/patch_tls_metrics_args.yaml b/config/overlays/openshift/patch_tls_metrics_args.yaml index b7866b72d..912b2949c 100644 --- a/config/overlays/openshift/patch_tls_metrics_args.yaml +++ b/config/overlays/openshift/patch_tls_metrics_args.yaml @@ -1,10 +1,6 @@ - op: add path: /spec/template/spec/containers/0/args/- - value: --metrics-tls-private-key-file=/var/run/tls/server/tls.key - -- op: add - path: /spec/template/spec/containers/0/args/- - value: --metrics-tls-cert-file=/var/run/tls/server/tls.crt + value: --metrics-tls-cert-dir=/var/run/tls/server/ - op: add path: /spec/template/spec/volumes/-