From 3467b87fcd8c410d1aaa3613bb5c3d083d7edfd9 Mon Sep 17 00:00:00 2001 From: Aditya Sundaramurthy Date: Mon, 25 May 2020 12:17:11 +0200 Subject: [PATCH] [stable/datadog] Fixes "merging map" warning messages with Helm 2 (#22436) * Fix warning messages with Helm 2.x Fixes warning messages like the below examples when using Helm 2. ``` Warning: Merging destination map for chart 'datadog'. The destination item 'confd' is a table and ignoring the source 'confd' as it has a non-table value of: Warning: Merging destination map for chart 'datadog'. The destination item 'resources' is a table and ignoring the source 'resources' as it has a non-table value of: ``` Fixes #22428 Signed-off-by: Aditya Sundaramurthy * Bump chart version Signed-off-by: Aditya Sundaramurthy * Updated changelog Signed-off-by: Aditya Sundaramurthy * Bump chart version Signed-off-by: Aditya Sundaramurthy --- stable/datadog/CHANGELOG.md | 4 ++++ stable/datadog/Chart.yaml | 2 +- stable/datadog/values.yaml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index 64f7d0961d..cdfc790abf 100644 --- a/stable/datadog/CHANGELOG.md +++ b/stable/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 2.3.4 + +* Fix default values in `values.yaml` to prevent warnings with Helm 2.x + ## 2.3.3 * Allow pre-release versions as docker image tag diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 4807e02272..02fbac9397 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.3.3 +version: 2.3.4 appVersion: "7" description: Datadog Agent keywords: diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index c4f883b983..d8d2411194 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -250,7 +250,7 @@ datadog: ## ref: https://github.com/DataDog/datadog-agent/tree/master/Dockerfiles/agent#optional-volumes ## ref: https://docs.datadoghq.com/agent/autodiscovery/ # - confd: + confd: {} # redisdb.yaml: |- # init_config: # instances: @@ -431,7 +431,7 @@ clusterAgent: ## Each key will become a file in /conf.d ## ref: https://docs.datadoghq.com/agent/autodiscovery/ # - confd: + confd: {} # mysql.yaml: |- # cluster_check: true # instances: @@ -987,7 +987,7 @@ kube-state-metrics: ## @param resources - object - optional ## Resource requests and limits for the kube-state-metrics container. # - resources: + resources: {} # requests: # cpu: 200m # memory: 256Mi