allanger/shoebill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

WIP: Trying to implement diff

Browse Source
This commit is contained in:
Nikolai Rodionov
2023-10-20 13:31:30 +02:00
parent 93ad3389b2
commit ed3d45a7c4
15 changed files with 197 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/utils/kustomize/kustomize.go
View File

@ -128,11 +128,10 @@ func Generate(path string, gh githelper.Githelper) error {
Name: "helm-root",
Namespace: "flux-system",
},
Resources: kustomize.Files,
Resources: append(kustomize.Files, kustomize.ConfigMaps...),
GeneratorOptions: &kustomize_types.GeneratorOptions{
DisableNameSuffixHash: true,
},
ConfigMapGenerator: kustomize.CmGeneratorFromFiles(),
}
if len(kustomize.Secrets) > 0 {
@ -172,7 +171,7 @@ func Generate(path string, gh githelper.Githelper) error {
return nil
}
if err := gh.AddAllAndCommit(path, "Update the root kustomization"); err != nil {
if _, err := gh.AddAllAndCommit(path, "Update the root kustomization"); err != nil {
return err
}