From 4add7eccd0f6b3f3c61e0c073705800440d40958 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Fri, 20 Nov 2020 14:34:11 -0800 Subject: [PATCH] fix rnode string format converted from resmap --- api/resmap/reswrangler.go | 2 +- api/resmap/reswrangler_test.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/api/resmap/reswrangler.go b/api/resmap/reswrangler.go index 213c90c5f..ef00d1914 100644 --- a/api/resmap/reswrangler.go +++ b/api/resmap/reswrangler.go @@ -568,7 +568,7 @@ func (m *resWrangler) Select(s types.Selector) ([]*resource.Resource, error) { func (m *resWrangler) ToRNodeSlice() ([]*kyaml_yaml.RNode, error) { var rnodes []*kyaml_yaml.RNode for _, r := range m.Resources() { - s, err := r.MarshalJSON() + s, err := r.AsYAML() if err != nil { return nil, err } diff --git a/api/resmap/reswrangler_test.go b/api/resmap/reswrangler_test.go index 0674fcc6f..1945f0aa7 100644 --- a/api/resmap/reswrangler_test.go +++ b/api/resmap/reswrangler_test.go @@ -16,7 +16,6 @@ import ( "sigs.k8s.io/kustomize/api/resource" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/yaml" ) var rf = resource.NewFactory( @@ -769,11 +768,7 @@ rules: if err != nil { t.Fatalf("unexpected error: %v", err) } - y, err := yaml.JSONToYAML([]byte(s)) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - b.WriteString(string(y)) + b.WriteString(s) } if !reflect.DeepEqual(input, b.String()) {