Skip to content

Commit 233b6ad

Browse files
authored
Merge pull request #4605 from m-Bilal/fix-4559
Fix kustomize 4.5.3+ breaking remote resources (4559)
2 parents 9d5491c + 66e4e15 commit 233b6ad

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

api/internal/target/kusttarget.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,11 @@ func (kt *KustTarget) accumulateResources(
411411
if errors.Is(errF, load.ErrorHTTP) {
412412
return nil, errF
413413
}
414-
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
415-
return nil, errF
416-
}
417414
ldr, err := kt.ldr.New(path)
418415
if err != nil {
416+
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
417+
return nil, errF
418+
}
419419
return nil, errors.Wrapf(
420420
err, "accumulation err='%s'", errF.Error())
421421
}
@@ -430,6 +430,9 @@ func (kt *KustTarget) accumulateResources(
430430
ra, err = kt.accumulateDirectory(ra, ldr, false)
431431
}
432432
if err != nil {
433+
if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
434+
return nil, errF
435+
}
433436
return nil, errors.Wrapf(
434437
err, "accumulation err='%s'", errF.Error())
435438
}

0 commit comments

Comments
 (0)