remove FixKustomizationPreUnmarshalling

This commit is contained in:
yugo kobayashi
2022-12-09 16:03:50 +00:00
parent 4cccb838ce
commit faddb49c89
8 changed files with 49 additions and 60 deletions

View File

@@ -101,10 +101,7 @@ func (lc *localizer) load() (*types.Kustomization, string, error) {
if err != nil {
return nil, "", errors.Wrap(err)
}
content, err = types.FixKustomizationPreUnmarshalling(content)
if err != nil {
return nil, "", errors.WrapPrefixf(err, "invalid kustomization")
}
var kust types.Kustomization
err = (&kust).Unmarshal(content)
if err != nil {

View File

@@ -210,7 +210,7 @@ bases:
- beta
configMapGenerator:
- env: env.properties
images:
imageTags:
- name: postgres
newName: my-registry/my-postgres
newTag: v1

View File

@@ -58,25 +58,21 @@ func (kt *KustTarget) Load() error {
if err != nil {
return err
}
content, err = types.FixKustomizationPreUnmarshalling(content)
if err != nil {
return err
}
var k types.Kustomization
err = k.Unmarshal(content)
if err != nil {
if err := k.Unmarshal(content); err != nil {
return err
}
// show warning message when using deprecated fields.
warningMessages := k.CheckDeprecatedFields()
if warningMessages != nil {
if warningMessages := k.CheckDeprecatedFields(); warningMessages != nil {
for _, msg := range *warningMessages {
fmt.Fprintf(os.Stderr, "%v\n", msg)
}
}
k.FixKustomizationPostUnmarshalling()
k.FixKustomization()
errs := k.EnforceFields()
if len(errs) > 0 {
return fmt.Errorf(