[stable/datadog] #1785 namespace defined templates with chart name

stable/datadog/Chart.yaml

@@ -1,5 +1,5 @@
 name: datadog
-version: 0.7.4
+version: 0.8.0
 description: DataDog Agent
 keywords:
 - monitoring

stable/datadog/templates/_helpers.tpl

@@ -2,15 +2,15 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "datadog.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "datadog.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -19,22 +19,22 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified confd name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "confd.fullname" -}}
+{{- define "datadog.confd.fullname" -}}
 {{- printf "%s-datadog-confd" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified autoconf name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "autoconf.fullname" -}}
+{{- define "datadog.autoconf.fullname" -}}
 {{- printf "%s-datadog-autoconf" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified checksd name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "checksd.fullname" -}}
+{{- define "datadog.checksd.fullname" -}}
 {{- printf "%s-datadog-checksd" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

stable/datadog/templates/autoconf-configmap.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "autoconf.fullname" . }}
+  name: {{ template "datadog.autoconf.fullname" . }}
   labels:
-    app: {{ template "autoconf.fullname" . }}
+    app: {{ template "datadog.autoconf.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/datadog/templates/checksd-configmap.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "checksd.fullname" . }}
+  name: {{ template "datadog.checksd.fullname" . }}
   labels:
-    app: {{ template "checksd.fullname" . }}
+    app: {{ template "datadog.checksd.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/datadog/templates/confd-configmap.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "confd.fullname" . }}
+  name: {{ template "datadog.confd.fullname" . }}
   labels:
-    app: {{ template "confd.fullname" . }}
+    app: {{ template "datadog.confd.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/datadog/templates/daemonset.yaml

@@ -3,15 +3,15 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "datadog.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
-      name: {{ template "fullname" . }}
+        app: {{ template "datadog.fullname" . }}
+      name: {{ template "datadog.fullname" . }}
       {{- if .Values.daemonset.podAnnotations }}
       annotations:
 {{ toYaml .Values.daemonset.podAnnotations | indent 8 }}
@@ -39,7 +39,7 @@ spec:
           - name: API_KEY
             valueFrom:
               secretKeyRef:
-                name: {{ template "fullname" . }}
+                name: {{ template "datadog.fullname" . }}
                 key: api-key
           - name: LOG_LEVEL
             value: {{ .Values.datadog.logLevel | quote }}
@@ -90,13 +90,13 @@ spec:
           name: cgroups
         - name: confd
           configMap:
-            name: {{ template "confd.fullname" . }}
+            name: {{ template "datadog.confd.fullname" . }}
         - name: checksd
           configMap:
-            name: {{ template "checksd.fullname" . }}
+            name: {{ template "datadog.checksd.fullname" . }}
         - name: autoconf
           configMap:
-            name: {{ template "autoconf.fullname" . }}
+            name: {{ template "datadog.autoconf.fullname" . }}
 {{- if .Values.datadog.volumes }}
 {{ toYaml .Values.datadog.volumes | indent 8 }}
 {{- end }}

stable/datadog/templates/deployment.yaml

@@ -3,16 +3,16 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "datadog.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   replicas: {{ .Values.deployment.replicas }}
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
-      name: {{ template "fullname" . }}
+        app: {{ template "datadog.fullname" . }}
+      name: {{ template "datadog.fullname" . }}
     spec:
       containers:
       - name: {{ .Chart.Name }}
@@ -33,7 +33,7 @@ spec:
           - name: API_KEY
             valueFrom:
               secretKeyRef:
-                name: {{ template "fullname" . }}
+                name: {{ template "datadog.fullname" . }}
                 key: api-key
           - name: LOG_LEVEL
             value: {{ .Values.datadog.logLevel | quote }}
@@ -87,13 +87,13 @@ spec:
           name: cgroups
         - name: confd
           configMap:
-            name: {{ template "confd.fullname" . }}
+            name: {{ template "datadog.confd.fullname" . }}
         - name: checksd
           configMap:
-            name: {{ template "checksd.fullname" . }}
+            name: {{ template "datadog.checksd.fullname" . }}
         - name: autoconf
           configMap:
-            name: {{ template "autoconf.fullname" . }}
+            name: {{ template "datadog.autoconf.fullname" . }}
 {{- if .Values.datadog.volumes }}
 {{ toYaml .Values.datadog.volumes | indent 8 }}
 {{- end }}

stable/datadog/templates/secrets.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "datadog.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "datadog.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/datadog/templates/service.yaml

@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "datadog.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "datadog.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
 spec:
   type: {{ .Values.serviceType }}
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "datadog.fullname" . }}
   ports:
   - port: 8125
     name: dogstatsdport