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

ignore the empty YAML object

Browse Source
This commit is contained in:
Jingfang Liu
2018-07-27 15:26:48 -07:00
parent 4d9d54e2c7
commit 2e7093e67f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/resmap/resmap.go
View File

@@ -23,6 +23,7 @@ import (
"io" "io"
"reflect" "reflect"
"sort" "sort"
"strings"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/golang/glog" "github.com/golang/glog"
@@ -202,13 +203,12 @@ func newResourceSliceFromBytes(in []byte) ([]*resource.Resource, error) {
decoder := k8syaml.NewYAMLOrJSONDecoder(bytes.NewReader(in), 1024) decoder := k8syaml.NewYAMLOrJSONDecoder(bytes.NewReader(in), 1024)
var result []*resource.Resource var result []*resource.Resource
var err error var err error
for { for err == nil || isEmptyYamlError(err) {
var out unstructured.Unstructured var out unstructured.Unstructured
err = decoder.Decode(&out) err = decoder.Decode(&out)
if err != nil { if err == nil {
break result = append(result, resource.NewResourceFromUnstruct(out))
} }
result = append(result, resource.NewResourceFromUnstruct(out))
} }
if err != io.EOF { if err != io.EOF {
return nil, err return nil, err
@@ -272,3 +272,7 @@ func MergeWithOverride(maps ...ResMap) (ResMap, error) {
} }
return result, nil return result, nil
} }
func isEmptyYamlError(err error) bool {
return strings.Contains(err.Error(), "is missing in 'null'")
}

4
pkg/resmap/resmap_test.go
View File

@@ -78,6 +78,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: dply2 name: dply2
---
# some comment
---
---
` `
l := loadertest.NewFakeLoader("/home/seans/project") l := loadertest.NewFakeLoader("/home/seans/project")