Merge pull request #5071 from milas/diff-kustomization-recursive-remote

fix: skip remote Kustomizations on recursive diff
fluxcd · Nov 14, 2024 · f42a17d · f42a17d
2 parents 9f854cb + 7697699
commit f42a17d
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/internal/build/diff.go b/internal/build/diff.go
@@ -146,14 +146,18 @@ func (b *Builder) diff() (string, bool, error) {
 			}
 
 			if !kustomizationsEqual(k, b.kustomization) {
-				subOutput, subCreatedOrDrifted, err := b.kustomizationDiff(k)
-				if err != nil {
-					diffErrs = append(diffErrs, err)
-				}
-				if subCreatedOrDrifted {
-					createdOrDrifted = true
-					output.WriteString(bunt.Sprint(fmt.Sprintf("📁 %s changed\n", ssautil.FmtUnstructured(obj))))
-					output.WriteString(subOutput)
+				if k.Spec.KubeConfig != nil {
+					output.WriteString(writeString(fmt.Sprintf("⚠️ %s skipped: diff not supported for remote clusters\n", ssautil.FmtUnstructured(obj)), bunt.Orange))
+				} else {
+					subOutput, subCreatedOrDrifted, err := b.kustomizationDiff(k)
+					if err != nil {
+						diffErrs = append(diffErrs, err)
+					}
+					if subCreatedOrDrifted {
+						createdOrDrifted = true
+						output.WriteString(bunt.Sprint(fmt.Sprintf("📁 %s changed\n", ssautil.FmtUnstructured(obj))))
+						output.WriteString(subOutput)
+					}
 				}
 
 				// finished with Kustomization diff