Revert "Fix: update merge to mergeOverwrite"

Reverting this commit to fix Multiple OSD issue.
Ceph deployment is failing when we specifying multiple osds.
Rendered file for ceph-osd charts have duplicate osd information.

Reverts this PS: https://review.opendev.org/#/c/644604/

This reverts commit 0b8784f26d.

Change-Id: Ida018955eb558c9f890cc9e6aefba6689c992a73
This commit is contained in:
Krishna Venkata 2019-04-29 22:56:11 +00:00
parent 0ed4f0de5e
commit b8ac702c07
1 changed files with 1 additions and 1 deletions

View File

@ -349,7 +349,7 @@ limitations under the License.
{{- $_ := set $context.Values.__tmpYAML.spec.template.spec "volumes" $context.Values.__tmpPodVols }}
{{ mergeOverwrite $context.Values.__daemonset_yaml $context.Values.__tmpYAML | toYaml }}
{{ merge $context.Values.__tmpYAML $context.Values.__daemonset_yaml | toYaml }}
{{ end }}