Add commonMetadata to flux build/diff

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>

cmd/flux/build_kustomization.go

@@ -21,10 +21,12 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/fluxcd/pkg/ssa"
 	"github.com/spf13/cobra"
 
-	"github.com/fluxcd/flux2/v2/internal/build"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
+
+	"github.com/fluxcd/flux2/v2/internal/build"
 )
 
 var buildKsCmd = &cobra.Command{
@@ -114,12 +116,17 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) {
 
 	errChan := make(chan error)
 	go func() {
-		manifests, err := builder.Build()
+		objects, err := builder.Build()
 		if err != nil {
 			errChan <- err
 		}
 
-		cmd.Print(string(manifests))
+		manifests, err := ssa.ObjectsToYAML(objects)
+		if err != nil {
+			errChan <- err
+		}
+
+		cmd.Print(manifests)
 		errChan <- nil
 	}()
 

cmd/flux/testdata/build-kustomization/podinfo-result.yaml

@@ -171,3 +171,4 @@ metadata:
   name: db-user-pass-bkbd782d2c
   namespace: default
 type: Opaque
+---

cmd/flux/testdata/build-kustomization/podinfo-with-var-substitution-result.yaml

@@ -214,3 +214,4 @@ metadata:
     kustomize.toolkit.fluxcd.io/substitute: disabled
   name: flux-grafana-dashboards-kt8md725kf
   namespace: default
+---

cmd/flux/testdata/build-kustomization/podinfo-without-service-result.yaml

@@ -99,3 +99,4 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: podinfo
+---