configurable container name (#8592)

* sets container name as defined in values file

use container name defined in Values file else use Chart name by default

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

* sets container name as defined in values file

use container name defined in Values file else use Chart name by default

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

* changes default to chart name

prior to this PR, the container name had been "datadog" (Chart name). suddenly changing to dd-agent might/could break things for those upgrading.

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

* makes cluster agent container name configurable

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

* adds settings to the readme

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

* bump version

Signed-off-by: Marc Ian Bucad <ian.bucad@gmail.com>

stable/datadog/Chart.yaml

@@ -1,5 +1,5 @@
 name: datadog
-version: 1.5.1
+version: 1.5.2
 appVersion: 6.5.2
 description: DataDog Agent
 keywords:

stable/datadog/README.md

@@ -49,6 +49,7 @@ The following table lists the configurable parameters of the Datadog chart and t
 | `image.pullSecrets`         | Image pull secrets                 |  `nil`                                    |
 | `rbac.create`               | If true, create & use RBAC resources | `true`                                  |
 | `rbac.serviceAccount`       | existing ServiceAccount to use (ignored if rbac.create=true) | `default`       |
+| `datadog.name`              | Container name if Deamonset or Deployment | `datadog`                          |
 | `datadog.env`               | Additional Datadog environment variables | `nil`                               |
 | `datadog.logsEnabled`       | Enable log collection              | `nil`                                     |
 | `datadog.logsConfigContainerCollectAll` | Collect logs from all containers | `nil`                           |
@@ -80,6 +81,7 @@ The following table lists the configurable parameters of the Datadog chart and t
 | `kube-state-metrics.rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) for kube-state-metrics | `default` |
 | `clusterAgent.enabled`                   | Use the cluster-agent for cluster metrics (Kubernetes 1.10+ only) | `false`                           |
 | `clusterAgent.token`                     | A cluster-internal secret for agent-to-agent communication. Must be 32+ characters a-zA-Z | `Nil` You must provide your own token|
+| `clusterAgent.containerName`             | The container name for the Cluster Agent  | `cluster-agent`                           |
 | `clusterAgent.image.repository`          | The image repository for the cluster-agent | `datadog/cluster-agent`                           |
 | `clusterAgent.image.tag`                 | The image tag to pull              | `0.10.0`                                   |
 | `clusterAgent.image.pullPolicy`          | Image pull policy                  | `IfNotPresent`                            |

stable/datadog/templates/agent-deployment.yaml

@@ -24,7 +24,7 @@ spec:
 {{ toYaml .Values.clusterAgent.image.pullSecrets | indent 8 }}
       {{- end }}
       containers:
-      - name: {{ .Chart.Name }}
+      - name: {{ .Values.clusterAgent.containerName }}
         image: "{{ .Values.clusterAgent.image.repository }}:{{ .Values.clusterAgent.image.tag }}"
         imagePullPolicy: {{ .Values.clusterAgent.image.pullPolicy }}
         resources:

stable/datadog/templates/daemonset.yaml

@@ -35,7 +35,7 @@ spec:
 {{ toYaml .Values.image.pullSecrets | indent 8 }}
       {{- end }}
       containers:
-      - name: {{ .Chart.Name }}
+      - name: {{ default .Chart.Name .Values.datadog.name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         resources:

stable/datadog/templates/deployment.yaml

@@ -27,7 +27,7 @@ spec:
 {{ toYaml .Values.image.pullSecrets | indent 8 }}
       {{- end }}
       containers:
-      - name: {{ .Chart.Name }}
+      - name: {{ default .Chart.Name .Values.datadog.name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         resources:

stable/datadog/values.yaml

@@ -87,6 +87,7 @@ kubeStateMetrics:
 # the external metrics API so you can autoscale HPAs based on datadog
 # metrics
 clusterAgent:
+  containerName: cluster-agent
   image:
     repository: datadog/cluster-agent
     tag: 0.10.0
@@ -123,9 +124,10 @@ datadog:
   ## Use existing Secret which stores APP key instead of creating a new one
   # appKeyExistingSecret:
 
-  ## dd-agent container name
+  ## Daemonset/Deployment container name
+  ## See clusterAgent.containerName if clusterAgent.enabled = true
   ##
-  name: dd-agent
+  name: datadog
 
   ## Set logging verbosity.
   ## ref: https://github.com/DataDog/docker-dd-agent#environment-variables