Merge PR #23023, #22999, #22992 and #22959

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
helm · Jul 3, 2020 · d6753b0 · d6753b0
5 parents 0066fae + 6cc281e + b946d1f + 0e64919 + 59a23c3
commit d6753b0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Datadog changelog
 
+## 2.3.22
+
+* Remove duplicate imagePullSecrets
+* Fix DataDog location to useConfigMap in docs
+* Adding explanation for metricsProvider.enabled
+
 ## 2.3.21
 
 * Fix additional default values in `values.yaml` to prevent errors with Helm 2.x

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.3.21
+version: 2.3.22
 appVersion: "7"
 description: Datadog Agent
 keywords:

diff --git a/stable/datadog/README.md b/stable/datadog/README.md
@@ -367,7 +367,7 @@ helm install --name <RELEASE_NAME> \
 | `agents.containers.initContainers.resources.requests.memory` | Memory resource requests for the init containers container                                                                                                                                                                                                                                          | `256Mi`                                         |
 | `agents.priorityClassName`                                   | Which Priority Class to associate with the daemonset                                                                                                                                                                                                                                                | `nil`                                           |
 | `agents.useConfigMap`                                        | Configures a configmap to provide the agent configuration. Use this in combination with the `agent.customAgentConfig` parameter.                                                                                                                                                                    | `false`                                         |
-| `agents.customAgentConfig`                                   | Specify custom contents for the datadog agent config (datadog.yaml). Note the `agent.useConfigMap` parameter needs to be set to `true` for this parameter to be taken into account.                                                                                                                 | `{}`                                            |
+| `agents.customAgentConfig`                                   | Specify custom contents for the datadog agent config (datadog.yaml). Note the `agents.useConfigMap` parameter needs to be set to `true` for this parameter to be taken into account.                                                                                                                 | `{}`                                            |
 | `agents.updateStrategy`                                      | Which update strategy to deploy the daemonset                                                                                                                                                                                                                                                       | RollingUpdate with 10% maxUnavailable           |
 | `agents.volumes`                                             | Additional volumes for the daemonset or deployment                                                                                                                                                                                                                                                  | `nil`                                           |
 | `agents.volumeMounts`                                        | Additional volumeMounts for the daemonset or deployment                                                                                                                                                                                                                                             | `nil`                                           |

diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml
@@ -75,8 +75,6 @@ spec:
       dnsConfig:
 {{ toYaml .Values.clusterAgent.dnsConfig | indent 8 }}
       {{- end }}
-      imagePullSecrets:
-{{ toYaml .Values.clusterAgent.image.pullSecrets | indent 8 }}
       containers:
       - name: cluster-agent
         image: "{{ .Values.clusterAgent.image.repository }}:{{ .Values.clusterAgent.image.tag }}"

diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
@@ -444,6 +444,9 @@ clusterAgent:
   ## Enable the metricsProvider to be able to scale based on metrics in Datadog
   #
   metricsProvider:
+    ## @param enabled - boolean - required - default: false
+    ## Set this to true to enable Metrics Provider
+    #
     enabled: false
 
     ## @param wpaController - boolean - optional
@@ -899,7 +902,7 @@ agents:
   ## Specify custom contents for the datadog agent config (datadog.yaml).
   ## ref: https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6
   ## ref: /~https://github.com/DataDog/datadog-agent/blob/master/pkg/config/config_template.yaml
-  ## Note the `agent.useConfigMap` needs to be set to `true` for this parameter to be taken into account.
+  ## Note the `agents.useConfigMap` needs to be set to `true` for this parameter to be taken into account.
   #
   customAgentConfig: {}
   #   # Autodiscovery for Kubernetes