From fa7043c1d79ad75fa162b3e1eb484dbc5b65e03f Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Wed, 19 Mar 2025 16:03:17 +0100
Subject: [PATCH] deployment/provenance: Unify log level setup
Refs. swh/infra/sysadm-environment#5608
---
swh/templates/provenance/_helper-config.yaml | 1 +
swh/templates/provenance/deployment.yaml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/swh/templates/provenance/_helper-config.yaml b/swh/templates/provenance/_helper-config.yaml
index 5be1e19eb..98cf29302 100644
--- a/swh/templates/provenance/_helper-config.yaml
+++ b/swh/templates/provenance/_helper-config.yaml
@@ -43,6 +43,7 @@ data:
{{- if not (hasKey $configuration "port") }}
{{- $port := eq $type "rpc" | ternary $.Values.provenance.rpcPort $.Values.provenance.grpcPort -}}
{{- $configuration := set $configuration "port" $port -}}
+{{- $logLevel := .configuration.logLevel | default $.Values.provenance.logLevel | default "INFO" | upper -}}
{{- end -}}
{{- toYaml $configuration -}}
{{- end }}
diff --git a/swh/templates/provenance/deployment.yaml b/swh/templates/provenance/deployment.yaml
index 322d554f0..b49a94150 100644
--- a/swh/templates/provenance/deployment.yaml
+++ b/swh/templates/provenance/deployment.yaml
@@ -18,6 +18,7 @@
"Values" $.Values) | fromYaml -}}
{{- $type := $provenanceConfig.type -}}
{{- $port := $provenanceConfig.port -}}
+{{- $logLevel := $provenanceConfig.logLevel -}}
---
apiVersion: apps/v1
kind: Deployment
@@ -141,7 +142,7 @@ spec:
- name: STATSD_SERVICE_TYPE
value: {{ $serviceType }}
- name: SWH_LOG_LEVEL
- value: {{ $provenanceConfig.logLevel | default $.Values.provenance.logLevel | default "INFO" | quote }}
+ value: {{ $logLevel }}
- name: SWH_LOG_CONFIG_JSON
value: /etc/swh/logging/logging-gunicorn.json
{{- if $.Values.provenance.sentry.enabled }}
--
GitLab