mirror of
https://github.com/fluxcd/flux2.git
synced 2026-02-18 05:31:48 +00:00
Merge pull request #259 from fluxcd/fix-bootstrap-sync
Always apply sync manifests on bootstrap
This commit is contained in:
commit
19d9953a48
2 changed files with 10 additions and 10 deletions
|
|
@ -239,12 +239,12 @@ 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 {
|
||||||
|
|
|
||||||
|
|
@ -211,12 +211,12 @@ 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")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue