actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-08 00:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5407 from cappyzawa/refactor-deprecated-ssa-func

Browse source 
refactor: Use `normalize.UnstructuredList` instead of `ssa.SetNativeKindsDefaults`
This commit is contained in:
Stefan Prodan 2025-06-13 14:07:43 +03:00 committed by GitHub
commit 7626cd0c86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/flux/diff_kustomization_test.go
View file

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

3
internal/build/diff.go
View file

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

3
internal/utils/apply.go
View file

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