From d719fd92d08c93aa40e4244fff2bf0a6428b5c88 Mon Sep 17 00:00:00 2001 From: Marc Ian Bucad Date: Fri, 19 Oct 2018 16:06:46 +0000 Subject: [PATCH] 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 * 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 * 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 * makes cluster agent container name configurable Signed-off-by: Marc Ian Bucad * adds settings to the readme Signed-off-by: Marc Ian Bucad * bump version Signed-off-by: Marc Ian Bucad --- stable/datadog/Chart.yaml | 2 +- stable/datadog/README.md | 2 ++ stable/datadog/templates/agent-deployment.yaml | 2 +- stable/datadog/templates/daemonset.yaml | 2 +- stable/datadog/templates/deployment.yaml | 2 +- stable/datadog/values.yaml | 6 ++++-- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 601f5e8e45..4d2fdee658 100755 --- a/stable/datadog/Chart.yaml +++ b/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: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 15957fa514..1563b8284b 100644 --- a/stable/datadog/README.md +++ b/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` | diff --git a/stable/datadog/templates/agent-deployment.yaml b/stable/datadog/templates/agent-deployment.yaml index 335f4d4c1a..544c76e278 100644 --- a/stable/datadog/templates/agent-deployment.yaml +++ b/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: diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 2e772f5504..15a2b79c6e 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/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: diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index 260936eed9..ef560ff21a 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/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: diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 2e72e71be4..3e75c0a7ef 100644 --- a/stable/datadog/values.yaml +++ b/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