From 7b4e815a8df9248f322d800c6b94f4a601728482 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Tue, 22 Sep 2020 14:58:51 +0300 Subject: [PATCH] Always apply sync manifests on bootstrap --- cmd/gotk/bootstrap_github.go | 10 +++++----- cmd/gotk/bootstrap_gitlab.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/gotk/bootstrap_github.go b/cmd/gotk/bootstrap_github.go index a8de2365..254b3312 100644 --- a/cmd/gotk/bootstrap_github.go +++ b/cmd/gotk/bootstrap_github.go @@ -239,12 +239,12 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error { return err } logger.Successf("sync manifests pushed") + } - // apply manifests and waiting for sync - logger.Actionf("applying sync manifests") - if err := applySyncManifests(ctx, kubeClient, namespace, namespace, ghPath, tmpDir); err != nil { - return err - } + // apply manifests and waiting for sync + logger.Actionf("applying sync manifests") + if err := applySyncManifests(ctx, kubeClient, namespace, namespace, ghPath, tmpDir); err != nil { + return err } if withErrors { diff --git a/cmd/gotk/bootstrap_gitlab.go b/cmd/gotk/bootstrap_gitlab.go index 00611f56..e51df900 100644 --- a/cmd/gotk/bootstrap_gitlab.go +++ b/cmd/gotk/bootstrap_gitlab.go @@ -211,12 +211,12 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error { return err } logger.Successf("sync manifests pushed") + } - // apply manifests and waiting for sync - logger.Actionf("applying sync manifests") - if err := applySyncManifests(ctx, kubeClient, namespace, namespace, glPath, tmpDir); err != nil { - return err - } + // apply manifests and waiting for sync + logger.Actionf("applying sync manifests") + if err := applySyncManifests(ctx, kubeClient, namespace, namespace, glPath, tmpDir); err != nil { + return err } logger.Successf("bootstrap finished")