feat(charts): make nucleusEnv an optional label for all charts (#2719)

Co-authored-by: Fabien Debatisse <fabien.debatisse@agregio-solutions.com>
nucleuscloud · Sep 19, 2024 · 7ac9a56 · 7ac9a56
1 parent 763d6b3
commit 7ac9a56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/backend/charts/api/templates/deployment.yaml b/backend/charts/api/templates/deployment.yaml
@@ -6,7 +6,9 @@ metadata:
   labels:
     {{- include "neosync-api.labels" . | nindent 4 }}
     {{- if eq .Values.datadog.enabled true }}
+    {{- if .Values.nucleusEnv }}
     tags.datadoghq.com/env: {{ .Values.nucleusEnv }}
+    {{- end }}
     tags.datadoghq.com/service: {{ template "neosync-api.fullname" . }}
     tags.datadoghq.com/version: {{ .Values.image.tag | default .Chart.AppVersion  }}
     {{- end }}
@@ -44,11 +46,15 @@ spec:
         {{- end }}
         {{- if eq .Values.datadog.enabled true }}
         admission.datadoghq.com/enabled: "true"
+        {{- if .Values.nucleusEnv }}
         tags.datadoghq.com/env: {{ .Values.nucleusEnv }}
+        {{- end }}
         tags.datadoghq.com/service: {{ template "neosync-api.fullname" . }}
         tags.datadoghq.com/version: {{ .Values.image.tag | default .Chart.AppVersion  }}
         {{- end }}
+        {{- if .Values.nucleusEnv }}
         tags.neosync.dev/env: {{ .Values.nucleusEnv }}
+        {{- end }}
         tags.neosync.dev/service: {{ template "neosync-api.fullname" . }}
         tags.neosync.dev/version: {{ .Values.image.tag | default .Chart.AppVersion  }}
     spec:

diff --git a/frontend/apps/web/charts/app/templates/deployment.yaml b/frontend/apps/web/charts/app/templates/deployment.yaml
@@ -5,7 +5,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- if eq .Values.datadog.enabled true }}
+    {{- if .Values.nucleusEnv }}
     tags.datadoghq.com/env: {{ .Values.nucleusEnv }}
+    {{- end }}
     tags.datadoghq.com/service: {{ template "neosync-app.fullname" . }}
     tags.datadoghq.com/version: {{ .Values.image.tag | default .Chart.AppVersion  }}
     {{- end }}
@@ -43,7 +45,9 @@ spec:
         {{- end }}
         {{- if eq .Values.datadog.enabled true }}
         admission.datadoghq.com/enabled: "true"
+        {{- if .Values.nucleusEnv }}
         tags.datadoghq.com/env: {{ .Values.nucleusEnv }}
+        {{- end }}
         tags.datadoghq.com/service: {{ template "neosync-app.fullname" . }}
         tags.datadoghq.com/version: {{ .Values.image.tag | default .Chart.AppVersion  }}
         {{- end }}