[stable/datadog]: update labels to match recommended standards (#6377)

* update labels to match recommended standards

* version

* use quote, do not quote

* too much regex

* remove quote from app

* trigger happy search and replace
This commit is contained in:
Philip Champon
2018-07-12 06:05:26 -07:00
committed by k8s-ci-robot
parent 0dbd3513ef
commit 847f737479
11 changed files with 41 additions and 34 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: datadog
version: 0.18.0
version: 0.18.1
appVersion: 6.3.0
description: DataDog Agent
keywords:
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ template "datadog.autoconf.fullname" . }}
labels:
app: {{ template "datadog.autoconf.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app: "{{ template "datadog.autoconf.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
annotations:
checksum/autoconf-config: {{ toYaml .Values.datadog.autoconf | sha256sum }}
data:
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ template "datadog.checksd.fullname" . }}
labels:
app: {{ template "datadog.checksd.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app: "{{ template "datadog.checksd.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
annotations:
checksum/checksd-config: {{ toYaml .Values.datadog.checksd | sha256sum }}
data:
+4 -4
View File
@@ -3,10 +3,10 @@ apiVersion: {{ template "rbac.apiVersion" . }}
kind: ClusterRole
metadata:
labels:
app: {{ template "datadog.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
heritage: {{ .Release.Service | quote }}
release: {{ .Release.Name | quote }}
name: {{ template "datadog.fullname" . }}
rules:
- nonResourceURLs:
@@ -3,10 +3,10 @@ apiVersion: {{ template "rbac.apiVersion" . }}
kind: ClusterRoleBinding
metadata:
labels:
app: {{ template "datadog.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
name: {{ template "datadog.fullname" . }}
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ template "datadog.confd.fullname" . }}
labels:
app: {{ template "datadog.confd.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app: "{{ template "datadog.confd.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
annotations:
checksum/confd-config: {{ toYaml .Values.datadog.confd | sha256sum }}
data:
+4 -1
View File
@@ -5,7 +5,10 @@ kind: DaemonSet
metadata:
name: {{ template "datadog.fullname" . }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
spec:
template:
metadata:
+4 -1
View File
@@ -5,7 +5,10 @@ kind: Deployment
metadata:
name: {{ template "datadog.fullname" . }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
spec:
replicas: {{ .Values.deployment.replicas }}
template:
+4 -4
View File
@@ -5,10 +5,10 @@ kind: Secret
metadata:
name: {{ template "datadog.fullname" . }}
labels:
app: {{ template "datadog.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
type: Opaque
data:
api-key: {{ default "MISSING" .Values.datadog.apiKey | b64enc | quote }}
+4 -3
View File
@@ -4,9 +4,10 @@ kind: Service
metadata:
name: {{ template "datadog.fullname" . }}
labels:
app: {{ template "datadog.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
spec:
type: {{ .Values.serviceType }}
selector:
+4 -4
View File
@@ -4,9 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app: {{ template "datadog.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
app: "{{ template "datadog.fullname" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
heritage: {{ .Release.Service | quote }}
release: {{ .Release.Name | quote }}
name: {{ template "datadog.fullname" . }}
{{- end -}}