actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-04-28 14:18:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add commonMetadata to flux build/diff

Browse source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2023-04-05 15:52:51 +03:00
parent 9293781702
commit cecffc0588
No known key found for this signature in database
GPG key ID: 3299AEB0E4085BAF
6 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/build/diff.go
View file

@ -39,10 +39,10 @@ import (
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/yaml"
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
"github.com/fluxcd/pkg/ssa"
"github.com/fluxcd/flux2/v2/pkg/printers"
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
)
func (b *Builder) Manager() (*ssa.ResourceManager, error) {
@ -58,12 +58,12 @@ func (b *Builder) Manager() (*ssa.ResourceManager, error) {
func (b *Builder) Diff() (string, bool, error) {
output := strings.Builder{}
createdOrDrifted := false
res, err := b.Build()
objects, err := b.Build()
if err != nil {
return "", createdOrDrifted, err
}
// convert the build result into Kubernetes unstructured objects
objects, err := ssa.ReadObjects(bytes.NewReader(res))
err = ssa.SetNativeKindsDefaults(objects)
if err != nil {
return "", createdOrDrifted, err
}
@ -76,10 +76,6 @@ func (b *Builder) Diff() (string, bool, error) {
ctx, cancel := context.WithTimeout(context.Background(), b.timeout)
defer cancel()
if err := ssa.SetNativeKindsDefaults(objects); err != nil {
return "", createdOrDrifted, err
}
if b.spinner != nil {
err = b.spinner.Start()
if err != nil {