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

Fix kustomize 4.5.3+ breaking remote resources (4559)
kubernetes-sigs · May 2, 2022 · 233b6ad · 233b6ad
2 parents 9d5491c + 66e4e15
commit 233b6ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go
@@ -411,11 +411,11 @@ func (kt *KustTarget) accumulateResources(
 			if errors.Is(errF, load.ErrorHTTP) {
 				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)
 			if err != nil {
+				if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
+					return nil, errF
+				}
 				return nil, errors.Wrapf(
 					err, "accumulation err='%s'", errF.Error())
 			}
@@ -430,6 +430,9 @@ func (kt *KustTarget) accumulateResources(
 				ra, err = kt.accumulateDirectory(ra, ldr, false)
 			}
 			if err != nil {
+				if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file
+					return nil, errF
+				}
 				return nil, errors.Wrapf(
 					err, "accumulation err='%s'", errF.Error())
 			}