DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

fix(clustertool): When flux-bootstrap fails, ensure rename change is undone first

Browse Source
This commit is contained in:
Kjeld Schouten
2024-11-09 21:04:48 +01:00
parent a62135cdd9
commit 55284f8567
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clustertool/pkg/fluxhandler/bootstrap.go
+9
View File
@@ -96,6 +96,15 @@ func setupFluxCD(ctx context.Context, fluxPath string) error {
if err := kubectlcmds.KubectlApplyKustomize(ctx, fluxPath); err != nil { if err := kubectlcmds.KubectlApplyKustomize(ctx, fluxPath); err != nil {
log.Error().Err(err).Str("path", fluxPath).Msg("Error applying FluxCD manifest") log.Error().Err(err).Str("path", fluxPath).Msg("Error applying FluxCD manifest")
log.Debug().Msg("Reverting renamed files for fluxbootstrap")
if err := os.Rename(filepath.Join(fluxPath, kustomFile), filepath.Join(fluxPath, bootstrapFile)); err != nil {
log.Error().Err(err).Msg("Error renaming kustomization file back after previous error")
return err
}
if err := os.Rename(filepath.Join(fluxPath, tmpFile), filepath.Join(fluxPath, kustomFile)); err != nil {
log.Error().Err(err).Msg("Error renaming placeholder file after previous back")
return err
}
return err return err
} }