From 9cdfcd3665104e9a1169ffeaf1a36b1c38759696 Mon Sep 17 00:00:00 2001 From: Benoit Ruiz Date: Wed, 27 Mar 2024 14:02:49 +0100 Subject: [PATCH] [synthetics] Auto set env var when enableStatusProbes is true (#1354) * [synthetics] Auto set env var when enableStatusProbes is true * [synthetics] Add missing quotes --- .../synthetics-private-location/CHANGELOG.md | 4 ++++ charts/synthetics-private-location/Chart.yaml | 2 +- charts/synthetics-private-location/README.md | 2 +- .../templates/deployment.yaml | 18 ++++++++++++------ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/charts/synthetics-private-location/CHANGELOG.md b/charts/synthetics-private-location/CHANGELOG.md index 08874938c..4a81e4e0d 100644 --- a/charts/synthetics-private-location/CHANGELOG.md +++ b/charts/synthetics-private-location/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 0.15.29 + +* Update Kubernetes deployment template to set `DATADOG_WORKER_ENABLE_STATUS_PROBES` environment variable when `enableStatusProbes` value is defined. + ## 0.15.28 * Update private location image version to `1.46.0`. diff --git a/charts/synthetics-private-location/Chart.yaml b/charts/synthetics-private-location/Chart.yaml index 0624190b8..56d140de5 100644 --- a/charts/synthetics-private-location/Chart.yaml +++ b/charts/synthetics-private-location/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: synthetics-private-location -version: 0.15.28 +version: 0.15.29 appVersion: 1.46.0 description: Datadog Synthetics Private Location keywords: diff --git a/charts/synthetics-private-location/README.md b/charts/synthetics-private-location/README.md index b27a9cbae..e5416c54d 100644 --- a/charts/synthetics-private-location/README.md +++ b/charts/synthetics-private-location/README.md @@ -1,6 +1,6 @@ # Datadog Synthetics Private Location -![Version: 0.15.28](https://img.shields.io/badge/Version-0.15.28-informational?style=flat-square) ![AppVersion: 1.46.0](https://img.shields.io/badge/AppVersion-1.46.0-informational?style=flat-square) +![Version: 0.15.29](https://img.shields.io/badge/Version-0.15.29-informational?style=flat-square) ![AppVersion: 1.46.0](https://img.shields.io/badge/AppVersion-1.46.0-informational?style=flat-square) [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds a Datadog Synthetics Private Location Deployment. For more information about synthetics monitoring with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/synthetics/private_locations). diff --git a/charts/synthetics-private-location/templates/deployment.yaml b/charts/synthetics-private-location/templates/deployment.yaml index 0926e953c..99c0614a9 100644 --- a/charts/synthetics-private-location/templates/deployment.yaml +++ b/charts/synthetics-private-location/templates/deployment.yaml @@ -65,14 +65,20 @@ spec: {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} -{{- if .Values.envFrom }} + {{- if .Values.envFrom }} envFrom: -{{ toYaml .Values.envFrom | indent 12 }} -{{- end }} -{{- if .Values.env }} + {{ toYaml .Values.envFrom | indent 12 }} + {{- end }} + {{- if or (.Values.env) (.Values.enableStatusProbes) }} env: -{{ toYaml .Values.env | indent 12 }} -{{- end }} + {{- if .Values.enableStatusProbes }} + - name: DATADOG_WORKER_ENABLE_STATUS_PROBES + value: {{ .Values.enableStatusProbes | quote }} + {{- end }} + {{- if .Values.env }} + {{ toYaml .Values.env | indent 12 }} + {{- end }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }}