actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-20 14:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #259 from fluxcd/fix-bootstrap-sync

Browse source 
Always apply sync manifests on bootstrap
This commit is contained in:
Stefan Prodan 2020-09-22 15:13:08 +03:00 committed by GitHub
commit 19d9953a48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/gotk/bootstrap_github.go
View file

@ -239,13 +239,13 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
return err return err
} }
logger.Successf("sync manifests pushed") logger.Successf("sync manifests pushed")
}
// apply manifests and waiting for sync // apply manifests and waiting for sync
logger.Actionf("applying sync manifests") logger.Actionf("applying sync manifests")
if err := applySyncManifests(ctx, kubeClient, namespace, namespace, ghPath, tmpDir); err != nil { if err := applySyncManifests(ctx, kubeClient, namespace, namespace, ghPath, tmpDir); err != nil {
return err return err
} }
}
if withErrors { if withErrors {
return fmt.Errorf("bootstrap completed with errors") return fmt.Errorf("bootstrap completed with errors")

2
cmd/gotk/bootstrap_gitlab.go
View file

@ -211,13 +211,13 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
return err return err
} }
logger.Successf("sync manifests pushed") logger.Successf("sync manifests pushed")
}
// apply manifests and waiting for sync // apply manifests and waiting for sync
logger.Actionf("applying sync manifests") logger.Actionf("applying sync manifests")
if err := applySyncManifests(ctx, kubeClient, namespace, namespace, glPath, tmpDir); err != nil { if err := applySyncManifests(ctx, kubeClient, namespace, namespace, glPath, tmpDir); err != nil {
return err return err
} }
}
logger.Successf("bootstrap finished") logger.Successf("bootstrap finished")
return nil return nil