From 296252fe2400a3e0017c869c27ab813912866917 Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 8 Jan 2019 15:46:29 +0100 Subject: [PATCH] Fix clusterchecks leader election (#10468) * Add service name envvar to the DCA Signed-off-by: Xavier Vello * Reword cluster-agent token note to account for token not synced issues Signed-off-by: Xavier Vello * update version Signed-off-by: Xavier Vello --- stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/NOTES.txt | 3 +++ stable/datadog/templates/cluster-agent-deployment.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index e24540cb2f..0dae90a54a 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 1.15.0 +version: 1.15.1 appVersion: 6.6.0 description: DataDog Agent keywords: diff --git a/stable/datadog/templates/NOTES.txt b/stable/datadog/templates/NOTES.txt index 9d78052ef7..9cb829aeb7 100644 --- a/stable/datadog/templates/NOTES.txt +++ b/stable/datadog/templates/NOTES.txt @@ -53,6 +53,9 @@ Create an application key at https://app.datadoghq.com/account/settings#api Because you enabled the Cluster Agent but did not provide a token, a random token was generated. This token is used to secure the communication between the Agents and the Cluster Agent. +Make sure to recreate all pods on upgrade (with the --recreate-pods flag) to ensure all +agents use the same shared token. + {{- end }} {{- end }} diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml index 7b883e72b1..5de9de64c6 100644 --- a/stable/datadog/templates/cluster-agent-deployment.yaml +++ b/stable/datadog/templates/cluster-agent-deployment.yaml @@ -74,6 +74,8 @@ spec: {{- if .Values.datadog.collectEvents }} - name: DD_COLLECT_KUBERNETES_EVENTS value: {{ .Values.datadog.collectEvents | quote}} + - name: DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME + value: {{ template "datadog.clusterAgent.fullname" . }} {{- end }} - name: DD_CLUSTER_AGENT_AUTH_TOKEN valueFrom: