Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-03-13 15:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix: skip remote Kustomizations on recursive diff
This commit is contained in:
Stefan Prodan
2024-11-14 16:58:20 +02:00
committed by GitHub
parent 9f854cb7e2 7697699e65
commit f42a17de54
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/build/diff.go
View File

@@ -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