From 8e7fd4c49e1da87072f5810b78a3e6ca8630c2a9 Mon Sep 17 00:00:00 2001
From: natemollica-dev <nathan.mollica@hashicorp.com>
Date: Tue, 30 Jan 2024 15:18:00 -0800
Subject: [PATCH] fix helpers.tpl consul.extraConfig from merge -->
 /consul/tmp/extra-config/extra-from-values.json | add labels to rolebinding
 for datadog secrets

---
 charts/consul/templates/_helpers.tpl                   | 2 +-
 charts/consul/templates/datadog-agent-rolebinding.yaml | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/consul/templates/_helpers.tpl b/charts/consul/templates/_helpers.tpl
index 59a1705289..ed87bda9db 100644
--- a/charts/consul/templates/_helpers.tpl
+++ b/charts/consul/templates/_helpers.tpl
@@ -145,7 +145,7 @@ substitution for HOST_IP/POD_IP/HOSTNAME. Useful for dogstats telemetry. The out
 is passed to consul as a -config-file param on command line.
 */}}
 {{- define "consul.extraconfig" -}}
-              cp /consul/config/extra-from-values.json /consul/extra-config/extra-from-values.json
+              cp /consul/tmp/extra-config/extra-from-values.json /consul/extra-config/extra-from-values.json
               [ -n "${HOST_IP}" ] && sed -Ei "s|HOST_IP|${HOST_IP?}|g" /consul/extra-config/extra-from-values.json
               [ -n "${POD_IP}" ] && sed -Ei "s|POD_IP|${POD_IP?}|g" /consul/extra-config/extra-from-values.json
               [ -n "${HOSTNAME}" ] && sed -Ei "s|HOSTNAME|${HOSTNAME?}|g" /consul/extra-config/extra-from-values.json
diff --git a/charts/consul/templates/datadog-agent-rolebinding.yaml b/charts/consul/templates/datadog-agent-rolebinding.yaml
index 4c7ff80258..5fc3fdf545 100644
--- a/charts/consul/templates/datadog-agent-rolebinding.yaml
+++ b/charts/consul/templates/datadog-agent-rolebinding.yaml
@@ -2,9 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: datadog-read-secrets
-  namespace: consul
+  name: {{ template "consul.fullname" . }}-datadog-metrics
+  namespace: {{ .Release.Namespace }}
   labels:
+    app: {{ template "consul.name" . }}
+    chart: {{ template "consul.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
     component: agent
 subjects:
   - kind: ServiceAccount