mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Do not process empty yaml objects (fixes #222)
This commit is contained in:
parent
dc91c4850b
commit
567532d74d
|
@ -251,6 +251,17 @@ func checksum(bytes []byte) string {
|
||||||
return hex.EncodeToString(d[:])
|
return hex.EncodeToString(d[:])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isEmptyYaml(yaml []byte) bool {
|
||||||
|
isEmpty := true
|
||||||
|
lines := bytes.Split(yaml, []byte("\n"))
|
||||||
|
for _, k := range lines {
|
||||||
|
if string(k) != "---" && !bytes.HasPrefix(k, []byte("#")) && string(k) != "" {
|
||||||
|
isEmpty = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return isEmpty
|
||||||
|
}
|
||||||
|
|
||||||
func yamlToObjects(in io.Reader) ([]runtime.Object, error) {
|
func yamlToObjects(in io.Reader) ([]runtime.Object, error) {
|
||||||
var result []runtime.Object
|
var result []runtime.Object
|
||||||
reader := yamlDecoder.NewYAMLReader(bufio.NewReaderSize(in, 4096))
|
reader := yamlDecoder.NewYAMLReader(bufio.NewReaderSize(in, 4096))
|
||||||
|
@ -263,6 +274,7 @@ func yamlToObjects(in io.Reader) ([]runtime.Object, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !isEmptyYaml(raw) {
|
||||||
obj, err := toObjects(raw)
|
obj, err := toObjects(raw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -270,6 +282,7 @@ func yamlToObjects(in io.Reader) ([]runtime.Object, error) {
|
||||||
|
|
||||||
result = append(result, obj...)
|
result = append(result, obj...)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
@ -279,6 +292,7 @@ func toObjects(bytes []byte) ([]runtime.Object, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
obj, _, err := unstructured.UnstructuredJSONScheme.Decode(bytes, nil, nil)
|
obj, _, err := unstructured.UnstructuredJSONScheme.Decode(bytes, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
Loading…
Reference in New Issue
Block a user