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

Fix issue where the schema was not propagated correctly when walking yaml doc

Browse Source
This commit is contained in:
Morten Torkildsen
2020-07-31 09:38:27 -07:00
parent 17f935452f
commit feeaa994b7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kyaml/setters2/walk.go
View File

@@ -50,9 +50,9 @@ func acceptImpl(v visitor, object *yaml.RNode, p string, oa *openapi.ResourceSch
} }
return object.VisitFields(func(node *yaml.MapNode) error { return object.VisitFields(func(node *yaml.MapNode) error {
// get the schema for the field and propagate it // get the schema for the field and propagate it
oa = getSchema(node.Key, oa, node.Key.YNode().Value) fieldSchema := getSchema(node.Key, oa, node.Key.YNode().Value)
// Traverse each field value // Traverse each field value
return acceptImpl(v, node.Value, p+"."+node.Key.YNode().Value, oa) return acceptImpl(v, node.Value, p+"."+node.Key.YNode().Value, fieldSchema)
}) })
case yaml.SequenceNode: case yaml.SequenceNode:
// get the schema for the sequence node, use the schema provided if not present // get the schema for the sequence node, use the schema provided if not present
@@ -61,15 +61,15 @@ func acceptImpl(v visitor, object *yaml.RNode, p string, oa *openapi.ResourceSch
return err return err
} }
// get the schema for the elements // get the schema for the elements
oa = getSchema(object, oa, "") schema := getSchema(object, oa, "")
return object.VisitElements(func(node *yaml.RNode) error { return object.VisitElements(func(node *yaml.RNode) error {
// Traverse each list element // Traverse each list element
return acceptImpl(v, node, p, oa) return acceptImpl(v, node, p, schema)
}) })
case yaml.ScalarNode: case yaml.ScalarNode:
// Visit the scalar field // Visit the scalar field
oa = getSchema(object, oa, "") fieldSchema := getSchema(object, oa, "")
return v.visitScalar(object, p, oa) return v.visitScalar(object, p, fieldSchema)
} }
return nil return nil
} }