From 48127217b75a81bb25db082576e6d96211b7ac97 Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Thu, 16 Nov 2023 11:35:37 +0100 Subject: [PATCH 1/2] Give another try to Datadog version * Surrender on appVersion and rely on .Values.image.tag * Fix mapping s/postgres/postgresql --- helm/thingsboard/templates/mqtt-transport.yaml | 4 ++-- helm/thingsboard/templates/node.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/thingsboard/templates/mqtt-transport.yaml b/helm/thingsboard/templates/mqtt-transport.yaml index bec4a49..87bf23a 100644 --- a/helm/thingsboard/templates/mqtt-transport.yaml +++ b/helm/thingsboard/templates/mqtt-transport.yaml @@ -20,7 +20,7 @@ metadata: name: {{ .Release.Name }}-mqtt-transport labels: tags.datadoghq.com/service: tb-mqtt-transport - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.iamge.tag }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- $podLabels := include "thingsboard.selectorLabels-mqtt" . }} @@ -43,7 +43,7 @@ spec: {{- end }} labels: tags.datadoghq.com/service: tb-mqtt-transport - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.image.tag }} admission.datadoghq.com/enabled: "true" {{- include "thingsboard.selectorLabels-mqtt" . | nindent 8 }} spec: diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml index 4e949ac..ed662ec 100644 --- a/helm/thingsboard/templates/node.yaml +++ b/helm/thingsboard/templates/node.yaml @@ -20,7 +20,7 @@ metadata: name: {{ .Release.Name }}-node labels: tags.datadoghq.com/service: tb-node - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.image.tag }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- $podLabels := include "thingsboard.selectorLabels-node" . }} @@ -43,7 +43,7 @@ spec: {{- end }} labels: tags.datadoghq.com/service: tb-node - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.image.tag }} admission.datadoghq.com/enabled: "true" {{- include "thingsboard.selectorLabels-node" . | nindent 8 }} spec: @@ -124,7 +124,7 @@ spec: - name: DEFAULT_INACTIVITY_TIMEOUT value: {{ .Values.node.state.defaultInactivityTimeoutInSec | default 600 | quote }} - name: DD_SERVICE_MAPPING - value: "postgres:thingsboard-postgres" + value: "postgresql:thingsboard-postgres" envFrom: - configMapRef: name: {{ .Release.Name }}-node-db-config From a90ffcfc34b7acbe6d0cc6f5a79cc9696411987f Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Thu, 16 Nov 2023 11:38:55 +0100 Subject: [PATCH 2/2] Update helm/thingsboard/templates/mqtt-transport.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ricard Nàcher <87518171+ricardnacher@users.noreply.github.com> --- helm/thingsboard/templates/mqtt-transport.yaml | 2 +- helm/thingsboard/templates/web-ui.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/thingsboard/templates/mqtt-transport.yaml b/helm/thingsboard/templates/mqtt-transport.yaml index 87bf23a..5f9aeeb 100644 --- a/helm/thingsboard/templates/mqtt-transport.yaml +++ b/helm/thingsboard/templates/mqtt-transport.yaml @@ -20,7 +20,7 @@ metadata: name: {{ .Release.Name }}-mqtt-transport labels: tags.datadoghq.com/service: tb-mqtt-transport - tags.datadoghq.com/version: {{ .Values.iamge.tag }} + tags.datadoghq.com/version: {{ .Values.image.tag }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- $podLabels := include "thingsboard.selectorLabels-mqtt" . }} diff --git a/helm/thingsboard/templates/web-ui.yaml b/helm/thingsboard/templates/web-ui.yaml index 020254d..86561fe 100644 --- a/helm/thingsboard/templates/web-ui.yaml +++ b/helm/thingsboard/templates/web-ui.yaml @@ -20,7 +20,7 @@ metadata: name: {{ .Release.Name }}-web-ui labels: tags.datadoghq.com/service: tb-ui - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.image.tag }} {{- include "thingsboard.labels" . | nindent 4 }} spec: {{- if not .Values.webui.autoscaling.enabled }} @@ -42,7 +42,7 @@ spec: {{- end }} labels: tags.datadoghq.com/service: tb-ui - tags.datadoghq.com/version: {{ .AppVersion }} + tags.datadoghq.com/version: {{ .Values.image.tag }} admission.datadoghq.com/enabled: "true" {{- include "thingsboard.selectorLabels-webui" . | nindent 8 }} spec: