tenant id in chart

flanksource · May 13, 2024 · 1afe045 · 1afe045
1 parent 8d01ebc
commit 1afe045
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -69,6 +69,12 @@ spec:
             {{- if .Values.db.runMigrations}}
             - --db-migrations
             {{- end}}
+            {{- if (tpl .Values.otel.collector .) }}
+            - --otel-collector-url={{ tpl .Values.otel.collector . | default "" }}
+            {{- end }}
+            {{- if (tpl .Values.otel.serviceName .) }}
+            - --otel-service-name={{ tpl .Values.otel.serviceName . | default "config-db" }}
+            {{- end }}
           {{- if .Values.upstream.enabled}}
           envFrom:
             - secretRef:
@@ -90,6 +96,10 @@ spec:
             - name: UPSTREAM_PAGE_SIZE
               value: '{{ .Values.upstream.pageSize }}'
             {{- end}}
+            {{- if .Values.labels}}
+            - name: OTEL_LABELS
+              value: '{{ .Values.labels }}'
+            {{- end}}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,7 +5,7 @@ global:
   db:
     connectionPooler:
       enabled: false
-      secretKeyRef: 
+      secretKeyRef:
         name: mission-control-connection-pooler
         key: DB_URL
 
@@ -30,6 +30,14 @@ configAnalysisRetentionDays: 60
 scrapeRuleConfigMaps:
   - config-db-rules
 
+otel:
+  # OpenTelemetry gRPC collector endpoint in host:port format
+  collector: ''
+  serviceName: config-db
+
+# labels in "a=b,c=d" format
+labels: ""
+
 db:
   runMigrations: true
   embedded:
@@ -89,15 +97,15 @@ serviceAccount:
   rbac:
     # Whether to create cluster-wide or namespaced roles
     clusterRole: true
-    
+
     # for secret management with valueFrom
     tokenRequest: true
     secrets: true
     configmaps: true
-    
+
     # for use with kubernetes resource lookups
     readAll: true
-    
+
     # for kubernetesFile lookups
     exec: true