From 7c6bf2e21d30a3dcde0a627ba24f636381a5408b Mon Sep 17 00:00:00 2001
From: monopole <jeff.regan@gmail.com>
Date: Thu, 14 Jan 2021 11:01:06 -0800
Subject: [PATCH] When merging configmaps, retain proper quoting.

---
 kyaml/yaml/rnode.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kyaml/yaml/rnode.go b/kyaml/yaml/rnode.go
index 63e028b06..a8131705c 100644
--- a/kyaml/yaml/rnode.go
+++ b/kyaml/yaml/rnode.go
@@ -435,13 +435,13 @@ func (rn *RNode) SetDataMap(m map[string]string) {
 	if rn == nil {
 		log.Fatal("cannot set data map on nil Rnode")
 	}
+	if err := rn.PipeE(Clear(DataField)); err != nil {
+		log.Fatal(err)
+	}
 	if len(m) == 0 {
-		if err := rn.PipeE(Clear(DataField)); err != nil {
-			log.Fatal(err)
-		}
 		return
 	}
-	if err := rn.SetMapField(NewMapRNode(&m), DataField); err != nil {
+	if err := rn.LoadMapIntoConfigMapData(m); err != nil {
 		log.Fatal(err)
 	}
 }