kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4895 from KnVerey/remove-local-last

Browse Source 
Remove local-only resources at the last minute
This commit is contained in:
Kubernetes Prow Robot
2022-12-01 13:20:00 -08:00
committed by GitHub
parent 663b777910 fb0f567b63
commit 0f4f978956
2 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/internal/target/kusttarget.go
View File

@@ -158,6 +158,11 @@ func (kt *KustTarget) makeCustomizedResMap() (resmap.ResMap, error) {
return nil, err
}
err = kt.IgnoreLocal(ra)
if err != nil {
return nil, err
}
return ra.ResMap(), nil
}
@@ -238,10 +243,6 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
return nil, errors.Wrapf(
err, "merging vars %v", kt.kustomization.Vars)
}
err = kt.IgnoreLocal(ra)
if err != nil {
return nil, err
}
return ra, nil
}