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

Minor fixes

Browse Source
This commit is contained in:
Nikolai Rodionov 2024-01-18 11:44:44 +01:00
parent 8e7a8998d3
commit cb8445666a
Signed by: allanger
GPG Key ID: 0AA46A90E25592AD
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/controller/controller.go
View File

@ -117,16 +117,16 @@ func Sync(definedWorkdirPath, sshKeyPath string, conf *config.Config, dry bool,
for _, release := range conf.Releases { for _, release := range conf.Releases {
// if len(diffArg) > 0 { // if len(diffArg) > 0 {
// _, err := hh.PullChart(workdirPath, release.ToHelmReleaseData()) // _, err := hh.PullChart(workdirPath, release.ToHelmReleaseData())
// if err != nil { // if err != nil {
// return err // return err
// } // }
// if err := hh.RenderChart(workdirPath, release.ToHelmReleaseData()); err != nil { // if err := hh.RenderChart(workdirPath, release.ToHelmReleaseData()); err != nil {
// return err // return err
// } // }
//
// } // }
if err := release.ValuesHandler(configPath); err != nil { if err := release.ValuesHandler(configPath); err != nil {
return err return err

6
internal/providers/flux.go
View File

@ -344,6 +344,9 @@ func SyncValues(currentRelease, wishedRelease *release.Release, secDirPath strin
func SyncSecrets(currentRelease, wishedRelease *release.Release, workdirPath, sopsBin string) error { func SyncSecrets(currentRelease, wishedRelease *release.Release, workdirPath, sopsBin string) error {
secretsDirPath := fmt.Sprintf("%s/src/secrets", workdirPath) secretsDirPath := fmt.Sprintf("%s/src/secrets", workdirPath)
if err := os.MkdirAll(secretsDirPath, os.ModePerm); err != nil {
return err
}
if currentRelease != nil { if currentRelease != nil {
for _, secrets := range currentRelease.DestSecrets { for _, secrets := range currentRelease.DestSecrets {
secretsFilePath := fmt.Sprintf("%s/%s", secretsDirPath, secrets.DestPath) secretsFilePath := fmt.Sprintf("%s/%s", secretsDirPath, secrets.DestPath)
@ -358,9 +361,6 @@ func SyncSecrets(currentRelease, wishedRelease *release.Release, workdirPath, so
// Prepare a dir for secrets // Prepare a dir for secrets
secretsFilePath := fmt.Sprintf("%s/%s", secretsDirPath, secrets.DestPath) secretsFilePath := fmt.Sprintf("%s/%s", secretsDirPath, secrets.DestPath)
logrus.Infof("trying to create secrets file: %s", secretsFilePath) logrus.Infof("trying to create secrets file: %s", secretsFilePath)
if err := os.MkdirAll(secretsDirPath, os.ModePerm); err != nil {
return err
}
var secretsFile *os.File var secretsFile *os.File
if _, err := os.Stat(secretsFilePath); err == nil { if _, err := os.Stat(secretsFilePath); err == nil {
secretsFile, err = os.Open(secretsFilePath) secretsFile, err = os.Open(secretsFilePath)