Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 13:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
6 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/build/build.go
View File

@@ -28,6 +28,7 @@ import (
"sync"
"time"
"github.com/fluxcd/pkg/ssa"
"github.com/theckman/yacspin"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -212,7 +213,7 @@ func (b *Builder) getKustomization(ctx context.Context) (*kustomizev1.Kustomizat
// and overlays the manifests with the resources specified in the resourcesPath
// It expects a kustomization.yaml file in the resourcesPath, and it will
// generate a kustomization.yaml file if it doesn't exist
func (b *Builder) Build() ([]byte, error) {
func (b *Builder) Build() ([]*unstructured.Unstructured, error) {
m, err := b.build()
if err != nil {
return nil, err
@@ -223,7 +224,16 @@ func (b *Builder) Build() ([]byte, error) {
return nil, fmt.Errorf("kustomize build failed: %w", err)
}
return resources, nil
objects, err := ssa.ReadObjects(bytes.NewReader(resources))
if err != nil {
return nil, fmt.Errorf("kustomize build failed: %w", err)
}
if m := b.kustomization.Spec.CommonMetadata; m != nil {
ssa.SetCommonMetadata(objects, m.Labels, m.Annotations)
}
return objects, nil
}
func (b *Builder) build() (m resmap.ResMap, err error) {