From 2efe3c8252432c19b23a9596fcf144556f6ceb64 Mon Sep 17 00:00:00 2001 From: Kevin Schumacher Date: Sun, 17 Sep 2017 10:52:25 -0400 Subject: [PATCH] [stable/datadog] #1785 namespace defined templates with chart name --- stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/_helpers.tpl | 10 +++++----- stable/datadog/templates/autoconf-configmap.yaml | 4 ++-- stable/datadog/templates/checksd-configmap.yaml | 4 ++-- stable/datadog/templates/confd-configmap.yaml | 4 ++-- stable/datadog/templates/daemonset.yaml | 14 +++++++------- stable/datadog/templates/deployment.yaml | 14 +++++++------- stable/datadog/templates/secrets.yaml | 4 ++-- stable/datadog/templates/service.yaml | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 221bb2f4db3d..b2fbaf9332a6 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 0.7.4 +version: 0.8.0 description: DataDog Agent keywords: - monitoring diff --git a/stable/datadog/templates/_helpers.tpl b/stable/datadog/templates/_helpers.tpl index cfda4c8c5aac..054390dd09ee 100644 --- a/stable/datadog/templates/_helpers.tpl +++ b/stable/datadog/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "datadog.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,7 +10,7 @@ Expand the name of the chart. 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,7 +19,7 @@ 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 -}} @@ -27,7 +27,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this 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 -}} @@ -35,6 +35,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this 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 -}} diff --git a/stable/datadog/templates/autoconf-configmap.yaml b/stable/datadog/templates/autoconf-configmap.yaml index b1199aa5dbbe..21f6b2c27e84 100644 --- a/stable/datadog/templates/autoconf-configmap.yaml +++ b/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 }}" diff --git a/stable/datadog/templates/checksd-configmap.yaml b/stable/datadog/templates/checksd-configmap.yaml index 2a0e88512bff..2014092b6616 100644 --- a/stable/datadog/templates/checksd-configmap.yaml +++ b/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 }}" diff --git a/stable/datadog/templates/confd-configmap.yaml b/stable/datadog/templates/confd-configmap.yaml index a403592d7f18..44f1fb1b038c 100644 --- a/stable/datadog/templates/confd-configmap.yaml +++ b/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 }}" diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 57b73f97c505..12e2efc5e71e 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/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 }} diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index eb4e7df18e06..ef5088157a70 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "datadog.fullname" . }} labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: @@ -11,8 +11,8 @@ spec: 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 }} diff --git a/stable/datadog/templates/secrets.yaml b/stable/datadog/templates/secrets.yaml index 927b6b9997bb..7484864b7b60 100644 --- a/stable/datadog/templates/secrets.yaml +++ b/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 }}" diff --git a/stable/datadog/templates/service.yaml b/stable/datadog/templates/service.yaml index f44f4faddbc4..b21ca8fb72a7 100644 --- a/stable/datadog/templates/service.yaml +++ b/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