Fix GHA mk2 flag, add experimental label

Author: WVerlaek

.github/actions/deploy-gitpod/entrypoint.sh

@@ -29,7 +29,7 @@ previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}
 PREVIEW_NAME="$(previewctl get-name --branch "${INPUT_NAME}")"
 export PREVIEW_NAME
 
-for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
+for var in WSMANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
   input_var="INPUT_${var}"
   if [[ -n "${!input_var:-}" ]];then
     export GITPOD_${var}=${!input_var}

.github/actions/deploy-gitpod/metadata.yml

@@ -13,7 +13,7 @@ inputs:
     previewctl_hash:
         description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt"
         required: false
-    with_ws_manager_mk2:
+    wsmanager_mk2:
         description: "Use WS Manager MK2"
         required: false
     with_dedicated_emu:

.github/workflows/build.yml

@@ -296,7 +296,7 @@ jobs:
           version: ${{needs.configuration.outputs.version}}
           sa_key: ${{ secrets.GCP_CREDENTIALS }}
           previewctl_hash: ${{ needs.build-previewctl.outputs.previewctl_hash }}
-          with_ws_manager_mk2: ${{needs.configuration.outputs.with_ws_manager_mk2}}
+          wsmanager_mk2: ${{needs.configuration.outputs.with_ws_manager_mk2}}
           with_dedicated_emulation: ${{needs.configuration.outputs.with_dedicated_emulation}}
           with_ee_license: ${{needs.configuration.outputs.with_ee_license}}
           analytics: ${{needs.configuration.outputs.analytics}}

.github/workflows/workspace-integration-tests.yml

@@ -130,6 +130,7 @@ jobs:
             sa_key: ${{ secrets.GCP_CREDENTIALS }}
             version: ${{ needs.configuration.outputs.version}}
             previewctl_hash: ${{needs.configuration.outputs.previewctl_hash }}
+            wsmanager_mk2: ${{ github.event.inputs.wsman_mk2 }}
 
     check:
         name: Check for regressions
@@ -204,7 +205,7 @@ jobs:
                   WS_MANAGER_TESTS="$BASE_TESTS_DIR/components/ws-manager"
                   WORKSPACE_TESTS="$BASE_TESTS_DIR/workspace"
 
-                  WS_MANAGER_MK2="${{ github.event.inputs.wsman_mk2 }}"
+                  export WS_MANAGER_MK2="${{ github.event.inputs.wsman_mk2 }}"
 
                   go install github.com/jstemmer/go-junit-report/v2@latest
 

dev/preview/workflow/preview/deploy-gitpod.sh

@@ -634,4 +634,8 @@ leeway run components:add-smith-token \
   -DPREVIEW_K3S_KUBE_CONTEXT="${PREVIEW_K3S_KUBE_CONTEXT}" \
   -DPREVIEW_NAMESPACE="${PREVIEW_NAMESPACE}"
 
+# Add experimental node label if ws-manager-mk2 is enabled.
+# Remove once mk2 workspaces no longer run on experimental nodes.
+kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" --namespace="${PREVIEW_NAMESPACE}" label nodes "${PREVIEW_K3S_KUBE_CONTEXT}" gitpod.io/experimental="true" --overwrite
+
 log_success "Installation is happy: https://${DOMAIN}/workspaces"