From 833d426da8e4b049277ca9847830f6e6beee40c3 Mon Sep 17 00:00:00 2001
From: Jugwan Eom <zugwan@gmail.com>
Date: Mon, 24 Jun 2019 06:33:11 +0000
Subject: [PATCH] fix host-specific overrides incorrectly overwriting previous
 values

root_conf area is used for host-specific configuration and overwritten in
each round of loop. It causes that all hosts will share same properties.
This makes use each host's own area in the loop.

Task: 34282
Story: 2005936

Change-Id: I0afb0b32ab80456aa3439b4221f2a95ca05ddf24
---
 ceph-osd/templates/utils/_osd_daemonset_overrides.tpl | 4 ++--
 helm-toolkit/templates/utils/_daemonset_overrides.tpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
index 0553e0038..7947695db 100644
--- a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
+++ b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
@@ -54,7 +54,7 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $host_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
               {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
@@ -93,7 +93,7 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $label_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
               {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
index 743bd6b34..50e43cacf 100644
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
@@ -48,7 +48,7 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $host_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
               {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
@@ -87,7 +87,7 @@ limitations under the License.
               {{/* apply overrides */}}
               {{- $override_conf_copy := $label_data.conf }}
               {{- $root_conf_copy := omit $context.Values.conf "overrides" }}
-              {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
+              {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
               {{- $root_conf_copy2 := dict "conf" $merged_dict }}
               {{- $context_values := omit $context.Values "conf" }}
               {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}