From 9106631cc7e5a95afd7abb2cac0c64500b1f5e89 Mon Sep 17 00:00:00 2001 From: Yoshiki Fujikane Date: Wed, 23 Apr 2025 16:01:29 +0900 Subject: [PATCH] Normalize resource key before grouping manifests to convert default namespace to empty Signed-off-by: Yoshiki Fujikane --- pkg/app/pipedv1/plugin/kubernetes/provider/diff.go | 8 ++++---- .../plugin/kubernetes_multicluster/provider/diff.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/diff.go b/pkg/app/pipedv1/plugin/kubernetes/provider/diff.go index 89407d36f8..40dc4b9358 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/diff.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/diff.go @@ -136,10 +136,10 @@ func DiffList(liveManifests, desiredManifests []Manifest, logger *zap.Logger, op func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChanges []Manifest) { // Sort the manifests before comparing. sort.Slice(news, func(i, j int) bool { - return news[i].Key().String() < news[j].Key().String() + return news[i].Key().normalize().String() < news[j].Key().normalize().String() }) sort.Slice(olds, func(i, j int) bool { - return olds[i].Key().String() < olds[j].Key().String() + return olds[i].Key().normalize().String() < olds[j].Key().normalize().String() }) var n, o int @@ -147,7 +147,7 @@ func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChange if n >= len(news) || o >= len(olds) { break } - if news[n].Key().String() == olds[o].Key().String() { + if news[n].Key().normalize().String() == olds[o].Key().normalize().String() { newChanges = append(newChanges, news[n]) oldChanges = append(oldChanges, olds[o]) n++ @@ -155,7 +155,7 @@ func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChange continue } // Has in news but not in olds so this should be a added one. - if news[n].Key().String() < olds[o].Key().String() { + if news[n].Key().normalize().String() < olds[o].Key().normalize().String() { adds = append(adds, news[n]) n++ continue diff --git a/pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/diff.go b/pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/diff.go index 89407d36f8..40dc4b9358 100644 --- a/pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/diff.go +++ b/pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/diff.go @@ -136,10 +136,10 @@ func DiffList(liveManifests, desiredManifests []Manifest, logger *zap.Logger, op func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChanges []Manifest) { // Sort the manifests before comparing. sort.Slice(news, func(i, j int) bool { - return news[i].Key().String() < news[j].Key().String() + return news[i].Key().normalize().String() < news[j].Key().normalize().String() }) sort.Slice(olds, func(i, j int) bool { - return olds[i].Key().String() < olds[j].Key().String() + return olds[i].Key().normalize().String() < olds[j].Key().normalize().String() }) var n, o int @@ -147,7 +147,7 @@ func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChange if n >= len(news) || o >= len(olds) { break } - if news[n].Key().String() == olds[o].Key().String() { + if news[n].Key().normalize().String() == olds[o].Key().normalize().String() { newChanges = append(newChanges, news[n]) oldChanges = append(oldChanges, olds[o]) n++ @@ -155,7 +155,7 @@ func groupManifests(olds, news []Manifest) (adds, deletes, newChanges, oldChange continue } // Has in news but not in olds so this should be a added one. - if news[n].Key().String() < olds[o].Key().String() { + if news[n].Key().normalize().String() < olds[o].Key().normalize().String() { adds = append(adds, news[n]) n++ continue