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

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
No known key found for this signature in database
GPG key ID: 3299AEB0E4085BAF
14 changed files with 461 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

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) {