Use apply command in CI

Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Oct 20, 2023 · 6c464dc · 6c464dc
1 parent a419aec
commit 6c464dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml
@@ -141,7 +141,11 @@ runs:
       id: constellation-init
       shell: bash
       run: |
-        constellation init --force --debug
+        cmd=apply
+        if constellation --help | grep -q init; then
+          cmd=init
+        fi
+        constellation $cmd --force --debug
         echo "KUBECONFIG=$(pwd)/constellation-admin.conf" | tee -a $GITHUB_OUTPUT
 
     - name: Wait for nodes to join and become ready

diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Initialize cluster
         shell: pwsh
         run: |
-          .\constellation.exe init --debug
+          .\constellation.exe apply --debug
 
       - name: Liveness probe
         shell: pwsh

diff --git a/e2e/internal/upgrade/upgrade_test.go b/e2e/internal/upgrade/upgrade_test.go
@@ -343,7 +343,7 @@ func runUpgradeApply(require *require.Assertions, cli string) {
 		tfLogFlag = "--tf-log=DEBUG"
 	}
 
-	cmd = exec.CommandContext(context.Background(), cli, "upgrade", "apply", "--debug", "--yes", tfLogFlag)
+	cmd = exec.CommandContext(context.Background(), cli, "apply", "--debug", "--yes", tfLogFlag)
 	stdout, stderr, err = runCommandWithSeparateOutputs(cmd)
 	require.NoError(err, "Stdout: %s\nStderr: %s", string(stdout), string(stderr))
 	require.NoError(containsUnexepectedMsg(string(stdout)))