Merge pull request #54 from flanksource/set-clerk-org-id-label

chore: add clerk org id label and fix tenant slug
flanksource · Jul 9, 2024 · 541716e · 541716e
2 parents e82e633 + 86a8261
commit 541716e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/chart/templates/helm-release.yaml b/chart/templates/helm-release.yaml
@@ -27,9 +27,16 @@ spec:
       name: vc-{{ .Release.Name }}
       key: config
   {{- with .Values.missionControl }}
+    {{- $global := $ }}
     {{- $customValues := dict }}
-    {{- $_ := set $customValues "global" (dict "otel" (dict "labels" (printf "org.id=%s,tenant.slug=%s" .clerkOrgID .tenantSlug))) }}
+
+    {{- $otelDict := dict "otel" (dict "labels" (printf "org.id=%s,tenant.slug=%s" .clerkOrgID $global.Values.tenantSlug)) }}
+    {{- $labelsDict := dict "labels" (dict "flanksource.com/clerk-org-id" .clerkOrgID ) }}
+
+    {{- $globalDict := dict "global" (merge (dict "otel" (dict "labels" $otelDict.otel.labels)) $labelsDict) }}
+
+    {{- $_ := set $customValues "global" $globalDict.global }}
     {{- $mergedValues := mergeOverwrite . $customValues }}
   values:
     {{- toYaml $mergedValues | nindent 4 }}
-  {{- end }}
+  {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -8,6 +8,8 @@ missionControl:
   clerkJWKSURL: ""
   clerkOrgID: ""
   global:
+    labels:
+      flanksource.com/clerk-org-id: ''
     otel:
       collector: grafana-agent-traces.default:4317
   db: