diff --git a/pkg/app/piped/cloudprovider/kubernetes/diff.go b/pkg/app/piped/cloudprovider/kubernetes/diff.go index 7fa5c64289..f1d81afa58 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/diff.go +++ b/pkg/app/piped/cloudprovider/kubernetes/diff.go @@ -134,22 +134,22 @@ func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChange o++ continue } - // Has in new but not in old so this should be a deleted one. + // Has in news but not in olds so this should be a added one. if news[n].Key.IsLessWithIgnoringNamespace(olds[o].Key) { - deletes = append(deletes, news[n]) + adds = append(adds, news[n]) n++ continue } - // Has in old but not in new so this should be an added one. - adds = append(adds, olds[o]) + // Has in olds but not in news so this should be an deleted one. + deletes = append(deletes, olds[o]) o++ } if len(news) > n { - deletes = append(deletes, news[n:]...) + adds = append(adds, news[n:]...) } if len(olds) > o { - adds = append(adds, olds[o:]...) + deletes = append(deletes, olds[o:]...) } return } diff --git a/pkg/app/piped/cloudprovider/kubernetes/diff_test.go b/pkg/app/piped/cloudprovider/kubernetes/diff_test.go index 759ec5ebe9..b6a8ee1480 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/diff_test.go +++ b/pkg/app/piped/cloudprovider/kubernetes/diff_test.go @@ -23,8 +23,8 @@ import ( func TestGroupManifests(t *testing.T) { testcases := []struct { name string - news []Manifest olds []Manifest + news []Manifest expectedAdds []Manifest expectedDeletes []Manifest expectedNewChanges []Manifest @@ -35,7 +35,7 @@ func TestGroupManifests(t *testing.T) { }, { name: "only adds", - olds: []Manifest{ + news: []Manifest{ {Key: ResourceKey{Name: "b"}}, {Key: ResourceKey{Name: "a"}}, }, @@ -46,7 +46,7 @@ func TestGroupManifests(t *testing.T) { }, { name: "only deletes", - news: []Manifest{ + olds: []Manifest{ {Key: ResourceKey{Name: "b"}}, {Key: ResourceKey{Name: "a"}}, }, @@ -57,11 +57,11 @@ func TestGroupManifests(t *testing.T) { }, { name: "only inters", - news: []Manifest{ + olds: []Manifest{ {Key: ResourceKey{Name: "b"}}, {Key: ResourceKey{Name: "a"}}, }, - olds: []Manifest{ + news: []Manifest{ {Key: ResourceKey{Name: "a"}}, {Key: ResourceKey{Name: "b"}}, }, @@ -76,12 +76,12 @@ func TestGroupManifests(t *testing.T) { }, { name: "all kinds", - news: []Manifest{ + olds: []Manifest{ {Key: ResourceKey{Name: "b"}}, {Key: ResourceKey{Name: "a"}}, {Key: ResourceKey{Name: "c"}}, }, - olds: []Manifest{ + news: []Manifest{ {Key: ResourceKey{Name: "a"}}, {Key: ResourceKey{Name: "d"}}, {Key: ResourceKey{Name: "b"}}, diff --git a/pkg/app/piped/driftdetector/kubernetes/detector.go b/pkg/app/piped/driftdetector/kubernetes/detector.go index 00da8c78ef..814cf3f7e0 100644 --- a/pkg/app/piped/driftdetector/kubernetes/detector.go +++ b/pkg/app/piped/driftdetector/kubernetes/detector.go @@ -187,7 +187,9 @@ func (d *detector) checkApplication(ctx context.Context, app *model.Application, liveManifests = filterIgnoringManifests(liveManifests) d.logger.Info(fmt.Sprintf("application %s has %d live manifests", app.Id, len(liveManifests))) - result, err := provider.DiffList(liveManifests, headManifests, + result, err := provider.DiffList( + headManifests, + liveManifests, diff.WithEquateEmpty(), diff.WithIgnoreAddingMapKeys(), diff.WithCompareNumberAndNumericString(), @@ -360,8 +362,8 @@ func makeSyncState(r *provider.DiffListResult, commit string) model.ApplicationS } var b strings.Builder - b.WriteString(fmt.Sprintf("Diff between the running resources and the definitions in Git at commit %q:\n", commit)) - b.WriteString("--- Git\n+++ Cluster\n\n") + b.WriteString(fmt.Sprintf("Diff between the defined state in Git at commit %s and actual state in cluster:\n\n", commit)) + b.WriteString("--- Expected\n+++ Actual\n\n") b.WriteString(r.DiffString()) return model.ApplicationSyncState{ diff --git a/pkg/app/piped/planpreview/kubernetesdiff.go b/pkg/app/piped/planpreview/kubernetesdiff.go index 23f4ed64bd..f2c238b380 100644 --- a/pkg/app/piped/planpreview/kubernetesdiff.go +++ b/pkg/app/piped/planpreview/kubernetesdiff.go @@ -79,9 +79,10 @@ func (b *builder) kubernetesDiff( } } - result, err := provider.DiffList(oldManifests, newManifests, + result, err := provider.DiffList( + oldManifests, + newManifests, diff.WithEquateEmpty(), - diff.WithIgnoreAddingMapKeys(), diff.WithCompareNumberAndNumericString(), ) if err != nil {