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 nil dereference issue in fieldmeta

Browse Source
This commit is contained in:
Phillip Wittrock
2020-02-13 15:02:04 -08:00
parent b7bef5dc44
commit 64c30a0678
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kyaml/fieldmeta/fieldmeta.go
View File

@@ -17,7 +17,7 @@ import (
type FieldMeta struct { type FieldMeta struct {
Schema spec.Schema Schema spec.Schema
Extensions *XKustomize Extensions XKustomize
} }
type XKustomize struct { type XKustomize struct {
@@ -62,9 +62,22 @@ func (fm *FieldMeta) Read(n *yaml.RNode) error {
return nil return nil
} }
func isExtensionEmpty(x XKustomize) bool {
if x.FieldSetter != nil {
return false
}
if x.SetBy != "" {
return false
}
if len(x.PartialFieldSetters) > 0 {
return false
}
return true
}
// Write writes the FieldMeta to a node // Write writes the FieldMeta to a node
func (fm *FieldMeta) Write(n *yaml.RNode) error { func (fm *FieldMeta) Write(n *yaml.RNode) error {
if fm.Extensions != nil { if !isExtensionEmpty(fm.Extensions) {
fm.Schema.VendorExtensible.AddExtension("x-kustomize", fm.Extensions) fm.Schema.VendorExtensible.AddExtension("x-kustomize", fm.Extensions)
} else { } else {
delete(fm.Schema.VendorExtensible.Extensions, "x-kustomize") delete(fm.Schema.VendorExtensible.Extensions, "x-kustomize")