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

Merge pull request #4605 from m-Bilal/fix-4559

Browse Source 
Fix kustomize 4.5.3+ breaking remote resources (4559)
This commit is contained in:
Kubernetes Prow Robot
2022-05-02 13:34:31 -07:00
committed by GitHub
parent 9d5491c2e2 66e4e1582b
commit 233b6adf7e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,11 +411,11 @@ func (kt *KustTarget) accumulateResources(
if errors.Is(errF, load.ErrorHTTP) { if errors.Is(errF, load.ErrorHTTP) {
return nil, errF return nil, errF
} }
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
return nil, errF
}
ldr, err := kt.ldr.New(path) ldr, err := kt.ldr.New(path)
if err != nil { if err != nil {
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
return nil, errF
}
return nil, errors.Wrapf( return nil, errors.Wrapf(
err, "accumulation err='%s'", errF.Error()) err, "accumulation err='%s'", errF.Error())
} }
@@ -430,6 +430,9 @@ func (kt *KustTarget) accumulateResources(
ra, err = kt.accumulateDirectory(ra, ldr, false) ra, err = kt.accumulateDirectory(ra, ldr, false)
} }
if err != nil { if err != nil {
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
return nil, errF
}
return nil, errors.Wrapf( return nil, errors.Wrapf(
err, "accumulation err='%s'", errF.Error()) err, "accumulation err='%s'", errF.Error())
} }