From 47762ae799c1c2724042fb89b4cc93db203db3d6 Mon Sep 17 00:00:00 2001 From: Cedric Lamoriniere Date: Tue, 1 Oct 2019 16:13:34 +0200 Subject: [PATCH] [stable/datadog] Add labels + deprecation notice (#17455) * [stable/datadog] Add labels recommended by Helm See https://helm.sh/docs/chart_best_practices/#standard-labels New labels are added, no existing labels are removed nor any label selectors updated. Signed-off-by: Peter Rifel * [stable/datadog] Add additional deprecation notes. * update recommended labels for improving the migration strategy. * prepare the deployment agent configuration deprecation Signed-off-by: cedric lamoriniere * [stable/datadog] add ci values.yaml files Signed-off-by: cedric lamoriniere * add missing labels on system-probe resources Signed-off-by: cedric lamoriniere * update NOTES.txt Signed-off-by: cedric lamoriniere --- stable/datadog/Chart.yaml | 4 +-- stable/datadog/README.md | 2 +- .../ci/cluster-agent-and-worker-values.yaml | 9 +++++++ stable/datadog/ci/default-values.yaml | 1 + stable/datadog/templates/NOTES.txt | 25 ++++++++++++------- .../datadog/templates/agent-apiservice.yaml | 5 ++++ .../agent-clusterchecks-deployment.yaml | 5 ++++ .../templates/agent-clusterchecks-rbac.yaml | 10 ++++++++ stable/datadog/templates/agent-rbac.yaml | 20 +++++++++++++++ stable/datadog/templates/agent-secret.yaml | 5 ++++ stable/datadog/templates/agent-services.yaml | 10 ++++++++ .../datadog/templates/checksd-configmap.yaml | 5 ++++ .../cluster-agent-confd-configmap.yaml | 5 ++++ .../templates/cluster-agent-deployment.yaml | 5 ++++ stable/datadog/templates/confd-configmap.yaml | 5 ++++ stable/datadog/templates/daemonset.yaml | 5 ++++ .../templates/datadog-yaml-configmap.yaml | 5 ++++ stable/datadog/templates/deployment.yaml | 5 ++++ stable/datadog/templates/hpa-rbac.yaml | 15 +++++++++++ stable/datadog/templates/rbac.yaml | 15 +++++++++++ stable/datadog/templates/secrets.yaml | 10 ++++++++ stable/datadog/templates/service.yaml | 5 ++++ .../templates/system-probe-configmap.yaml | 10 ++++++++ stable/datadog/values.yaml | 4 +-- 24 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 stable/datadog/ci/cluster-agent-and-worker-values.yaml create mode 100644 stable/datadog/ci/default-values.yaml diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index a1946fb1ee..6445a4fcb6 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: datadog -version: 1.36.0 -appVersion: 6.13.0 +version: 1.37.0 +appVersion: 6.14.0 description: DataDog Agent keywords: - monitoring diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 90371d32b3..67b59ca2ee 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -10,7 +10,7 @@ See the [Datadog JMX integration](https://docs.datadoghq.com/integrations/java/) Kubernetes 1.4+ or OpenShift 3.4+, note that: -* the Datadog Agent supports Kubernetes 1.3+ +* the Datadog Agent supports Kubernetes 1.4+ * The Datadog chart's defaults are tailored to Kubernetes 1.7.6+, see [Datadog Agent legacy Kubernetes versions documentation](https://github.com/DataDog/datadog-agent/tree/master/Dockerfiles/agent#legacy-kubernetes-versions) for adjustments you might need to make for older versions ## Quick start diff --git a/stable/datadog/ci/cluster-agent-and-worker-values.yaml b/stable/datadog/ci/cluster-agent-and-worker-values.yaml new file mode 100644 index 0000000000..6b5724741d --- /dev/null +++ b/stable/datadog/ci/cluster-agent-and-worker-values.yaml @@ -0,0 +1,9 @@ +# Empty values file for testing default parameters. +clusterAgent: + enabled: true + +clusterChecks: + enabled: true + +clusterchecksDeployment: + enabled: true diff --git a/stable/datadog/ci/default-values.yaml b/stable/datadog/ci/default-values.yaml new file mode 100644 index 0000000000..7394e238e8 --- /dev/null +++ b/stable/datadog/ci/default-values.yaml @@ -0,0 +1 @@ +# Empty values file for testing default parameters. diff --git a/stable/datadog/templates/NOTES.txt b/stable/datadog/templates/NOTES.txt index 2cc9ecb28e..fdb15fdbb8 100644 --- a/stable/datadog/templates/NOTES.txt +++ b/stable/datadog/templates/NOTES.txt @@ -64,21 +64,28 @@ agents use the same shared token. The datadog agent is listening on port 8126. {{- end }} -{{- if (and (.Values.daemonset.enabled) (.Values.deployment.enabled)) }} - +{{- if .Values.deployment.enabled }} ################################################################# #### WARNING: Deprecation notice #### ################################################################# -Simultaneous DaemonSet + Deployment installation within a single -release will be deprecated in a future version. You will still be -able to run both as separate releases with separate value files. +* Deployment installation will be deprecated in the future major + chart version (`v2.0.0`). This installation configuration is + triggered by the option: `deployment.enabled: true`. + The recommended solution is to run the Datadog-agent with the + `Daemonset` configuration which is the default configuration. -Running as a Deployment is not necessary for event collection -anymore, thanks to the leader election feature. +{{- if .Values.daemonset.enabled }} -We encourage you to migrate to a single DaemonSet, or split your -chart if your use case still requires a separate Deployment. +* Simultaneous DaemonSet + Deployment installation within a single + release will be deprecated in the futur major chart version + (`v2.0.0`). + + Running as a Deployment is not necessary for event collection + anymore, thanks to the leader election feature. + + We encourage you to migrate to a single DaemonSet. +{{- end }} {{- end }} {{- if .Values.datadog.autoconf }} diff --git a/stable/datadog/templates/agent-apiservice.yaml b/stable/datadog/templates/agent-apiservice.yaml index 9432ba935f..e25ae8d2d5 100644 --- a/stable/datadog/templates/agent-apiservice.yaml +++ b/stable/datadog/templates/agent-apiservice.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: service: name: {{ template "datadog.fullname" . }}-cluster-agent-metrics-api diff --git a/stable/datadog/templates/agent-clusterchecks-deployment.yaml b/stable/datadog/templates/agent-clusterchecks-deployment.yaml index 4f520b2d43..a2ea7e284e 100644 --- a/stable/datadog/templates/agent-clusterchecks-deployment.yaml +++ b/stable/datadog/templates/agent-clusterchecks-deployment.yaml @@ -14,6 +14,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: replicas: {{ .Values.clusterchecksDeployment.replicas }} strategy: diff --git a/stable/datadog/templates/agent-clusterchecks-rbac.yaml b/stable/datadog/templates/agent-clusterchecks-rbac.yaml index 1034a3d5fe..05e0e789d2 100644 --- a/stable/datadog/templates/agent-clusterchecks-rbac.yaml +++ b/stable/datadog/templates/agent-clusterchecks-rbac.yaml @@ -7,6 +7,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-checks roleRef: apiGroup: rbac.authorization.k8s.io @@ -25,5 +30,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-checks {{- end -}} diff --git a/stable/datadog/templates/agent-rbac.yaml b/stable/datadog/templates/agent-rbac.yaml index 40063453d6..c42903aa8c 100644 --- a/stable/datadog/templates/agent-rbac.yaml +++ b/stable/datadog/templates/agent-rbac.yaml @@ -7,6 +7,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent rules: - apiGroups: @@ -79,6 +84,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent roleRef: apiGroup: rbac.authorization.k8s.io @@ -97,6 +107,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent {{- end }} @@ -110,6 +125,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent:system:auth-delegator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/stable/datadog/templates/agent-secret.yaml b/stable/datadog/templates/agent-secret.yaml index 72cae6ae89..7fdfc25346 100644 --- a/stable/datadog/templates/agent-secret.yaml +++ b/stable/datadog/templates/agent-secret.yaml @@ -10,6 +10,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: Opaque data: {{ if .Values.clusterAgent.token -}} diff --git a/stable/datadog/templates/agent-services.yaml b/stable/datadog/templates/agent-services.yaml index ecc736429d..4d79606e08 100644 --- a/stable/datadog/templates/agent-services.yaml +++ b/stable/datadog/templates/agent-services.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: type: ClusterIP selector: @@ -29,6 +34,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: type: ClusterIP selector: diff --git a/stable/datadog/templates/checksd-configmap.yaml b/stable/datadog/templates/checksd-configmap.yaml index 2d4f50fe39..1b56683b2e 100644 --- a/stable/datadog/templates/checksd-configmap.yaml +++ b/stable/datadog/templates/checksd-configmap.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} annotations: checksum/checksd-config: {{ tpl (toYaml .Values.datadog.checksd) . | sha256sum }} data: diff --git a/stable/datadog/templates/cluster-agent-confd-configmap.yaml b/stable/datadog/templates/cluster-agent-confd-configmap.yaml index 0911f847d6..5c89581774 100644 --- a/stable/datadog/templates/cluster-agent-confd-configmap.yaml +++ b/stable/datadog/templates/cluster-agent-confd-configmap.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} annotations: checksum/confd-config: {{ tpl (toYaml .Values.clusterAgent.confd) . | sha256sum }} data: diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml index d8b84153e6..84d4424d68 100644 --- a/stable/datadog/templates/cluster-agent-deployment.yaml +++ b/stable/datadog/templates/cluster-agent-deployment.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: replicas: {{ .Values.clusterAgent.replicas }} strategy: diff --git a/stable/datadog/templates/confd-configmap.yaml b/stable/datadog/templates/confd-configmap.yaml index 4d76edbd1a..c507a8ebd7 100644 --- a/stable/datadog/templates/confd-configmap.yaml +++ b/stable/datadog/templates/confd-configmap.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} annotations: checksum/confd-config: {{ tpl (toYaml .Values.datadog.confd) . | sha256sum }} checksum/autoconf-config: {{ tpl (toYaml .Values.datadog.autoconf) . | sha256sum }} diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 461486d964..5ca41c7e12 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -15,6 +15,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: selector: matchLabels: diff --git a/stable/datadog/templates/datadog-yaml-configmap.yaml b/stable/datadog/templates/datadog-yaml-configmap.yaml index 0b2177c51d..66e3700100 100644 --- a/stable/datadog/templates/datadog-yaml-configmap.yaml +++ b/stable/datadog/templates/datadog-yaml-configmap.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} annotations: data: datadog.yaml: | diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index 584dae2633..9e1a76b11c 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -15,6 +15,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: selector: matchLabels: diff --git a/stable/datadog/templates/hpa-rbac.yaml b/stable/datadog/templates/hpa-rbac.yaml index 6cf6087aa1..1a5361d5f2 100644 --- a/stable/datadog/templates/hpa-rbac.yaml +++ b/stable/datadog/templates/hpa-rbac.yaml @@ -7,6 +7,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent-external-metrics-reader rules: - apiGroups: @@ -26,6 +31,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }}-cluster-agent-external-metrics-reader roleRef: apiGroup: rbac.authorization.k8s.io @@ -44,6 +54,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: "{{ template "datadog.fullname" . }}-cluster-agent" roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/stable/datadog/templates/rbac.yaml b/stable/datadog/templates/rbac.yaml index a3e5c0a483..9abadfb587 100644 --- a/stable/datadog/templates/rbac.yaml +++ b/stable/datadog/templates/rbac.yaml @@ -7,6 +7,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }} rules: {{- if not .Values.clusterAgent.enabled }} @@ -91,6 +96,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io @@ -110,5 +120,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} name: {{ template "datadog.fullname" . }} {{- end -}} diff --git a/stable/datadog/templates/secrets.yaml b/stable/datadog/templates/secrets.yaml index 3ee532b3c8..2560521aad 100644 --- a/stable/datadog/templates/secrets.yaml +++ b/stable/datadog/templates/secrets.yaml @@ -10,6 +10,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: Opaque data: api-key: {{ default "MISSING" .Values.datadog.apiKey | b64enc | quote }} @@ -29,6 +34,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: Opaque data: app-key: {{ default "MISSING" .Values.datadog.appKey | b64enc | quote }} diff --git a/stable/datadog/templates/service.yaml b/stable/datadog/templates/service.yaml index 1975ce1580..843252b240 100644 --- a/stable/datadog/templates/service.yaml +++ b/stable/datadog/templates/service.yaml @@ -8,6 +8,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- if .Values.deployment.service.annotations }} annotations: {{ toYaml .Values.deployment.service.annotations | indent 4 }} diff --git a/stable/datadog/templates/system-probe-configmap.yaml b/stable/datadog/templates/system-probe-configmap.yaml index 84f5403f45..969ac53905 100644 --- a/stable/datadog/templates/system-probe-configmap.yaml +++ b/stable/datadog/templates/system-probe-configmap.yaml @@ -10,6 +10,11 @@ metadata: chart_version: {{ $.Chart.Version }} chart_name: {{ $.Chart.Name }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} data: system-probe.yaml: | system_probe_config: @@ -30,6 +35,11 @@ metadata: chart_version: {{ $.Chart.Version }} chart_name: {{ $.Chart.Name }} heritage: {{ .Release.Service | quote }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + app.kubernetes.io/name: "{{ template "datadog.fullname" . }}" + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} data: system-probe-seccomp.json: | { diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 2f83b2fff2..f246f7d498 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -16,9 +16,9 @@ image: ## @param tag - string - required ## Define the Agent version to use. - ## Use 6.13.0-jmx to enable jmx fetch collection + ## Use 6.14.0-jmx to enable jmx fetch collection # - tag: 6.13.0 + tag: 6.14.0 ## @param pullPolicy - string - required ## The Kubernetes pull policy.