add DD_HOSTNAME, DD_AC_INCLUDE, DD_AC_EXCLUDE to DaemonSet config (#1…

…0211) Signed-off-by: Laurent Fallet <laurent.fallet@gmail.com>
helm · Jan 8, 2019 · 692daad · 692daad
1 parent 172708d
commit 692daad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 1.15.1
+version: 1.16.0
 appVersion: 6.6.0
 description: DataDog Agent
 keywords:

diff --git a/stable/datadog/README.md b/stable/datadog/README.md
@@ -93,6 +93,9 @@ The following table lists the configurable parameters of the Datadog chart and t
 | `datadog.resources.limits.memory` | Memory resource limits       | `256Mi`                                   |
 | `datadog.securityContext`   | Allows you to overwrite the default securityContext applied to the container  | `nil`  |
 | `datadog.livenessProbe`     | Overrides the default liveness probe | exec /probe.sh                          |
+| `datadog.hostname`          | Set the hostname (write it in datadog.conf) | `nil`                            |
+| `datadog.acInclude`         | Include containers based on image name | `nil`                                 |
+| `datadog.acExclude`         | Exclude containers based on image name | `nil`                                 |
 | `daemonset.podAnnotations`  | Annotations to add to the DaemonSet's Pods | `nil`                             |
 | `daemonset.tolerations`     | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil`           |
 | `daemonset.nodeSelector`    | Node selectors                     | `nil`                                     |

diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
@@ -96,6 +96,18 @@ spec:
           - name: DD_PROCESS_AGENT_ENABLED
             value: {{ .Values.datadog.processAgentEnabled | quote }}
           {{- end }}
+          {{- if .Values.datadog.hostname }}
+          - name: DD_HOSTNAME
+            value: {{ .Values.datadog.hostname | quote }}
+          {{- end }}
+          {{- if .Values.datadog.acInclude }}
+          - name: DD_AC_INCLUDE
+            value: {{ .Values.datadog.acInclude | quote }}
+          {{- end }}
+          {{- if .Values.datadog.acExclude }}
+          - name: DD_AC_EXCLUDE
+            value: {{ .Values.datadog.acExclude | quote }}
+          {{- end }}
           {{- if not .Values.clusterAgent.enabled }}
           {{- if .Values.datadog.leaderElection }}
           - name: DD_LEADER_ELECTION