kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix rnode string format converted from resmap

Browse Source
This commit is contained in:
Donny Xia
2020-11-20 14:34:11 -08:00
parent a0a89e1adc
commit 4add7eccd0
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/resmap/reswrangler.go
View File

@@ -568,7 +568,7 @@ func (m *resWrangler) Select(s types.Selector) ([]*resource.Resource, error) {
func (m *resWrangler) ToRNodeSlice() ([]*kyaml_yaml.RNode, error) { func (m *resWrangler) ToRNodeSlice() ([]*kyaml_yaml.RNode, error) {
var rnodes []*kyaml_yaml.RNode var rnodes []*kyaml_yaml.RNode
for _, r := range m.Resources() { for _, r := range m.Resources() {
s, err := r.MarshalJSON() s, err := r.AsYAML()
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
api/resmap/reswrangler_test.go
View File

@@ -16,7 +16,6 @@ import (
"sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/resource"
resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/yaml"
) )
var rf = resource.NewFactory( var rf = resource.NewFactory(
@@ -769,11 +768,7 @@ rules:
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
y, err := yaml.JSONToYAML([]byte(s)) b.WriteString(s)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
b.WriteString(string(y))
} }
if !reflect.DeepEqual(input, b.String()) { if !reflect.DeepEqual(input, b.String()) {