From c868b805f8c24b1c19efb00b09f402c8ce9ebc4e Mon Sep 17 00:00:00 2001
From: Matt Klich <matt@elementalvoid.com>
Date: Mon, 16 Dec 2019 20:01:39 -0700
Subject: [PATCH] [stable/datadog] use 6.15, remove hard coded names/versions
 (#18930)

* Datadog: remove hard coded names

* The new system-probe container and config used hard coded CongigMap
names meaning only one installation is possible per cluster and
namespace.

Signed-off-by: Matt Klich <matt@elementalvoid.com>

* bump version

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 stable/datadog/Chart.yaml                            | 2 +-
 stable/datadog/templates/daemonset.yaml              | 4 ++--
 stable/datadog/templates/system-probe-configmap.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index a57289eb45..ed5435d737 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 1.38.13
+version: 1.38.14
 appVersion: "6"
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
index 2281335850..11c669308a 100644
--- a/stable/datadog/templates/daemonset.yaml
+++ b/stable/datadog/templates/daemonset.yaml
@@ -146,11 +146,11 @@ spec:
         {{- if and .Values.systemProbe.enabled .Values.daemonset.useDedicatedContainers }}
         - name: sysprobe-config
           configMap:
-            name: system-probe-config
+            name: {{ template "datadog.fullname" . }}-system-probe-config
         {{- if eq .Values.systemProbe.seccomp "localhost/system-probe" }}
         - name: datadog-agent-security
           configMap:
-            name: datadog-agent-security
+            name: {{ template "datadog.fullname" . }}-security
         - hostPath:
             path: {{ .Values.systemProbe.seccompRoot }}
           name: seccomp-root
diff --git a/stable/datadog/templates/system-probe-configmap.yaml b/stable/datadog/templates/system-probe-configmap.yaml
index e19dc129f4..9efd13fc75 100644
--- a/stable/datadog/templates/system-probe-configmap.yaml
+++ b/stable/datadog/templates/system-probe-configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: system-probe-config
+  name: {{ template "datadog.fullname" . }}-system-probe-config
   namespace: {{ $.Release.Namespace }}
   labels:
     app: {{ $.Chart.Name }}
@@ -28,7 +28,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: datadog-agent-security
+  name: {{ template "datadog.fullname" . }}-security
   namespace: {{ $.Release.Namespace }}
   labels:
     app: {{ $.Chart.Name }}