From 5291902fd7725695d0826dd921ece54e910eb678 Mon Sep 17 00:00:00 2001
From: cappyzawa <cappyzawa@gmail.com>
Date: Fri, 13 Jun 2025 13:19:24 +0900
Subject: [PATCH] Use normalize.UnstructuredList instead of
 ssa.SetNativeKindsDefaults

Signed-off-by: cappyzawa <cappyzawa@gmail.com>
---
 cmd/flux/diff_kustomization_test.go | 3 ++-
 internal/build/diff.go              | 3 ++-
 internal/utils/apply.go             | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmd/flux/diff_kustomization_test.go b/cmd/flux/diff_kustomization_test.go
index b6d4e9af..33cea70e 100644
--- a/cmd/flux/diff_kustomization_test.go
+++ b/cmd/flux/diff_kustomization_test.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/fluxcd/flux2/v2/internal/build"
 	"github.com/fluxcd/pkg/ssa"
+	"github.com/fluxcd/pkg/ssa/normalize"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -151,7 +152,7 @@ func createObjectFromFile(objectFile string, templateValues map[string]string, t
 		t.Fatalf("Error decoding yaml file '%s': %v", objectFile, err)
 	}
 
-	if err := ssa.SetNativeKindsDefaults(clientObjects); err != nil {
+	if err := normalize.UnstructuredList(clientObjects); err != nil {
 		t.Fatalf("Error setting native kinds defaults for '%s': %v", objectFile, err)
 	}
 
diff --git a/internal/build/diff.go b/internal/build/diff.go
index b6636641..f6df0cc9 100644
--- a/internal/build/diff.go
+++ b/internal/build/diff.go
@@ -41,6 +41,7 @@ import (
 	"github.com/fluxcd/cli-utils/pkg/object"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 	"github.com/fluxcd/pkg/ssa"
+	"github.com/fluxcd/pkg/ssa/normalize"
 	ssautil "github.com/fluxcd/pkg/ssa/utils"
 
 	"github.com/fluxcd/flux2/v2/pkg/printers"
@@ -80,7 +81,7 @@ func (b *Builder) diff() (string, bool, error) {
 		return "", createdOrDrifted, err
 	}
 
-	err = ssa.SetNativeKindsDefaults(objects)
+	err = normalize.UnstructuredList(objects)
 	if err != nil {
 		return "", createdOrDrifted, err
 	}
diff --git a/internal/utils/apply.go b/internal/utils/apply.go
index 5867287c..2ce7359c 100644
--- a/internal/utils/apply.go
+++ b/internal/utils/apply.go
@@ -33,6 +33,7 @@ import (
 	"github.com/fluxcd/cli-utils/pkg/kstatus/polling"
 	runclient "github.com/fluxcd/pkg/runtime/client"
 	"github.com/fluxcd/pkg/ssa"
+	"github.com/fluxcd/pkg/ssa/normalize"
 	ssautil "github.com/fluxcd/pkg/ssa/utils"
 
 	"github.com/fluxcd/flux2/v2/pkg/manifestgen/kustomization"
@@ -50,7 +51,7 @@ func Apply(ctx context.Context, rcg genericclioptions.RESTClientGetter, opts *ru
 		return "", fmt.Errorf("no Kubernetes objects found at: %s", manifestPath)
 	}
 
-	if err := ssa.SetNativeKindsDefaults(objs); err != nil {
+	if err := normalize.UnstructuredList(objs); err != nil {
 		return "", err
 	}