From b87f82139d9dc23bf93e8337118b1774e4e3c8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Tue, 24 Oct 2023 09:05:44 +0200 Subject: [PATCH] Apply review suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .github/actions/constellation_create/action.yml | 3 ++- cli/internal/cmd/apply.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml index e3781cd5d5..25815f6157 100644 --- a/.github/actions/constellation_create/action.yml +++ b/.github/actions/constellation_create/action.yml @@ -147,11 +147,12 @@ runs: id: constellation-init shell: bash run: | + # TODO(v2.14): Remove workaround for CLIs not supporting apply command cmd=apply if constellation --help | grep -q init; then cmd=init fi - constellation $cmd --force --debug + constellation $cmd --debug echo "KUBECONFIG=$(pwd)/constellation-admin.conf" | tee -a $GITHUB_OUTPUT - name: Wait for nodes to join and become ready diff --git a/cli/internal/cmd/apply.go b/cli/internal/cmd/apply.go index a8438cafaf..493019ddf9 100644 --- a/cli/internal/cmd/apply.go +++ b/cli/internal/cmd/apply.go @@ -45,7 +45,7 @@ func NewApplyCmd() *cobra.Command { cmd := &cobra.Command{ Use: "apply", Short: "Apply a configuration to a Constellation cluster", - Long: "Apply an upgrade to a Constellation cluster by applying the chosen configuration.", + Long: "Apply a configuration to a Constellation cluster to initialize or upgrade the cluster.", Args: cobra.NoArgs, RunE: runApply, }