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

Defer openAPI cleanup

Browse Source
This commit is contained in:
Phani Teja Marupaka
2020-11-02 12:07:32 -08:00
parent 49094cf999
commit ec2cc2d421
13 changed files with 110 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kyaml/setters2/settersutil/substitutioncreator.go
View File

@@ -93,9 +93,11 @@ func (c SubstitutionCreator) Create() error {
}
// Load the updated definitions
if err := openapi.AddSchemaFromFile(c.OpenAPIPath); err != nil {
clean, err := openapi.AddSchemaFromFile(c.OpenAPIPath)
if err != nil {
return err
}
defer clean()
visited := sets.String{}
ref, err := spec.NewRef(fieldmeta.DefinitionsPrefix + fieldmeta.SubstitutionDefinitionPrefix + c.Name)
@@ -119,9 +121,11 @@ func (c SubstitutionCreator) Create() error {
}
// Load the updated definitions after setters are created
if err := openapi.AddSchemaFromFile(c.OpenAPIPath); err != nil {
clean, err = openapi.AddSchemaFromFile(c.OpenAPIPath)
if err != nil {
return err
}
defer clean()
// revert openAPI file if there are cycles detected in created input substitution
if err := checkForCycles(ext, visited); err != nil {