Merge pull request #50 from ndustrialio/devops-495

DEVOPS-495 fix common labels
ndustrialio · Aug 16, 2022 · 89b639c · 89b639c
2 parents 81cfd92 + 3dafd47
commit 89b639c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/ndustrial/common/Chart.yaml b/ndustrial/common/Chart.yaml
@@ -19,5 +19,5 @@ sources:
   - https://ndustrial.io/
 type: library
 # Please make sure that version and appVersion are always the same.
-version: 0.2.14
-appVersion: 0.2.14
+version: 0.2.15
+appVersion: 0.2.15
diff --git a/ndustrial/common/templates/_labels.tpl b/ndustrial/common/templates/_labels.tpl
@@ -21,13 +21,13 @@ ndustrial.io/project.type: {{ .type }}
 ndustrial.io/version: {{ .version }}
 {{- if hasKey . "managed_by" }}
 ndustrial.io/managed-by: {{ .managed_by }}
-{{- end -}}
+{{- end }}
 {{- if hasKey . "env" }}
 ndustrial.io/env: {{ .env }}
-{{- end -}}
+{{- end }}
 {{- if hasKey . "repo" }}
 ndustrial.io/repo: {{ .repo }}
-{{- end -}}
+{{- end }}
 {{/*
 # Datadog labels
 */}}
@@ -36,18 +36,16 @@ tags.datadoghq.com/version: {{ .version }}
 tags.datadoghq.com/service: {{ .name }}
 {{- end -}}
 {{- end -}}
-{{/*
-# Contxt labels
-*/}}
+
 {{- if hasKey .Values "contxt" -}}
 {{- with .Values.contxt -}}
-{{- if hasKey . "projectId" }}
+{{- if and (hasKey . "projectId") (hasKey . "serviceId") }}
 contxt/project.id: {{ .projectId | quote }}
 contxt/service.id: {{ .serviceId | quote }}
-{{- if hasKey . "serviceType" -}}
+{{- if hasKey . "serviceId" }}
 contxt/service.type: {{ .serviceType }}
-{{- end -}}
-{{- end -}}
+{{- end }}
+{{- end }}
 {{- end -}}
 {{- end -}}
 {{- end -}}