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

Update dependencies to Kubernetes v1.28.6

Browse Source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
2024-01-30 14:07:35 +02:00
parent 475bcb63b5
commit 5e14014e37
14 changed files with 461 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/build/build.go
View File

@@ -29,7 +29,6 @@ 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"
@@ -45,6 +44,7 @@ import (
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
"github.com/fluxcd/pkg/kustomize"
runclient "github.com/fluxcd/pkg/runtime/client"
ssautil "github.com/fluxcd/pkg/ssa/utils"
"sigs.k8s.io/kustomize/kyaml/filesys"
"github.com/fluxcd/flux2/v2/internal/utils"
@@ -251,13 +251,13 @@ func (b *Builder) Build() ([]*unstructured.Unstructured, error) {
return nil, fmt.Errorf("kustomize build failed: %w", err)
}
objects, err := ssa.ReadObjects(bytes.NewReader(resources))
objects, err := ssautil.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)
ssautil.SetCommonMetadata(objects, m.Labels, m.Annotations)
}
return objects, nil

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"
ssautil "github.com/fluxcd/pkg/ssa/utils"
"github.com/fluxcd/flux2/v2/pkg/printers"
)
@@ -145,7 +146,7 @@ func (b *Builder) Diff() (string, bool, error) {
createdOrDrifted = true
}
for _, object := range staleObjects {
output.WriteString(writeString(fmt.Sprintf("► %s deleted\n", ssa.FmtUnstructured(object)), bunt.OrangeRed))
output.WriteString(writeString(fmt.Sprintf("► %s deleted\n", ssautil.FmtUnstructured(object)), bunt.OrangeRed))
}
}
}

4
internal/tree/tree.go
View File

@@ -23,7 +23,7 @@ import (
"strings"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/pkg/ssa"
ssautil "github.com/fluxcd/pkg/ssa/utils"
)
const (
@@ -74,7 +74,7 @@ func (t *objMetadataTree) AddTree(tree ObjMetadataTree) {
}
func (t *objMetadataTree) Text() string {
return ssa.FmtObjMetadata(t.Resource)
return ssautil.FmtObjMetadata(t.Resource)
}
func (t *objMetadataTree) Items() []ObjMetadataTree {

7
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"
ssautil "github.com/fluxcd/pkg/ssa/utils"
"github.com/fluxcd/flux2/v2/pkg/manifestgen/kustomization"
)
@@ -62,7 +63,7 @@ func Apply(ctx context.Context, rcg genericclioptions.RESTClientGetter, opts *ru
var stageTwo []*unstructured.Unstructured
for _, u := range objs {
if ssa.IsClusterDefinition(u) {
if ssautil.IsClusterDefinition(u) {
stageOne = append(stageOne, u)
} else {
stageTwo = append(stageTwo, u)
@@ -108,7 +109,7 @@ func readObjects(root, manifestPath string) ([]*unstructured.Unstructured, error
if err != nil {
return nil, err
}
return ssa.ReadObjects(bytes.NewReader(resources))
return ssautil.ReadObjects(bytes.NewReader(resources))
}
ms, err := os.Open(manifestPath)
@@ -117,7 +118,7 @@ func readObjects(root, manifestPath string) ([]*unstructured.Unstructured, error
}
defer ms.Close()
return ssa.ReadObjects(bufio.NewReader(ms))
return ssautil.ReadObjects(bufio.NewReader(ms))
}
func newManager(rcg genericclioptions.RESTClientGetter, opts *runclient.Options) (*ssa.ResourceManager, error) {