Use TF_WORKSPACE var to set workspaces

.werft/platform-delete-preview-environment.yaml

@@ -34,10 +34,6 @@ pod:
           readOnly: true
         - name: harvester-kubeconfig
           mountPath: /mnt/secrets/harvester-kubeconfig
-        - name: harvester-vm-ssh-keys
-          mountPath: /mnt/secrets/harvester-vm-ssh-keys
-        - name: harvester-k3s-dockerhub-pull-account
-          mountPath: /mnt/secrets/harvester-k3s-dockerhub-pull-account
       env:
         - name: LEEWAY_WORKSPACE_ROOT
           value: /workspace
@@ -56,11 +52,6 @@ pod:
           set -Eeuo pipefail
 
           sudo chown -R gitpod:gitpod /workspace
-          mkdir /workspace/.ssh
-          cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa /workspace/.ssh/id_rsa_harvester_vm
-          cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa.pub /workspace/.ssh/id_rsa_harvester_vm.pub
-          sudo chmod 600 /workspace/.ssh/id_rsa_harvester_vm
-          sudo chmod 644 /workspace/.ssh/id_rsa_harvester_vm.pub
 
           (cd .werft && yarn install && mv node_modules ..) | werft log slice prep
           printf '{{ toJson . }}' > context.json

dev/preview/BUILD.yaml

@@ -38,7 +38,7 @@ scripts:
     description: Delete an existing preview environment
     script: |
       export DESTROY=true
-      export TF_VAR_kubeconfig_path="${TF_VAR_kubeconfig_path:-/home/gitpod/.kube/config}"
+      export TF_VAR_kubeconfig_path="${TF_VAR_kubeconfig_path:-$HOME/.kube/config}"
       export TF_VAR_preview_name="${TF_VAR_preview_name:-$(previewctl get-name)}"
       ./workflow/preview/deploy-harvester.sh
 

dev/preview/workflow/lib/terraform.sh

@@ -17,36 +17,24 @@ if [ -n "${DESTROY-}" ]; then
   export TF_CLI_ARGS_plan="${TF_CLI_ARGS_plan} -destroy"
 fi
 
-function check_workspace() {
+function delete_workspace() {
   local workspace=$1
-  if [[ $(terraform workspace show) != "${workspace}" ]]; then
-    log_error "Expected to be in [${workspace}]. We are in [$(terraform workspace show)]"
-    return "${ERROR_WRONG_WORKSPACE}"
+  local exists=0
+  terraform workspace list | grep -q "${workspace}" || exists=$?
+  if [[ "${exists}" == 0 ]]; then
+    TF_WORKSPACE="default" terraform workspace delete "${workspace}"
   fi
 }
 
-function set_workspace() {
+function create_workspace() {
   local workspace=$1
   if terraform workspace list | grep -q "${workspace}"; then
-    terraform workspace select "${workspace}"
+    return 0
   else
     terraform workspace new "${workspace}"
   fi
 }
 
-function delete_workspace() {
-  local workspace=$1
-  if [[ $(terraform workspace show) == "${workspace}" ]]; then
-    terraform workspace select default
-  fi
-
-  exists=0
-  terraform workspace list | grep -q "${workspace}" || exists=$?
-  if [[ "${exists}" == 0 ]]; then
-    terraform workspace delete "${workspace}"
-  fi
-}
-
 function terraform_init() {
   local target_dir=${1:-$TARGET_DIR}
   if [ -z "${target_dir-}" ]; then
@@ -55,10 +43,10 @@ function terraform_init() {
   fi
   pushd "${target_dir}" || return "${ERROR_CHANGE_DIR}"
 
-  terraform init
-  if [ -n "${WORKSPACE-}" ]; then
-    set_workspace "${WORKSPACE}"
-    check_workspace "${WORKSPACE}"
+  TF_WORKSPACE="default" terraform init
+
+  if [ -n "${TF_WORKSPACE}" ]; then
+    create_workspace "${TF_WORKSPACE}"
   fi
 
   popd || return "${ERROR_CHANGE_DIR}"
@@ -77,12 +65,6 @@ function terraform_plan() {
 
   pushd "${target_dir}" || return "${ERROR_CHANGE_DIR}"
 
-  # check if we should be in a workspace, and bail otherwise
-  if [ -n "${WORKSPACE-}" ]; then
-    set_workspace "${WORKSPACE}"
-    check_workspace "${WORKSPACE}"
-  fi
-
   # -detailed-exitcode will be 0=success no changes/1=failure/2=success changes
   # therefore we capture the output so our function doesn't cause a script to terminate if the caller has `set -e`
   EXIT_CODE=0
@@ -111,12 +93,6 @@ function terraform_apply() {
     return "${ERROR_NO_PLAN}"
   fi
 
-  # check if we should be in a workspace, and bail otherwise
-  if [ -n "${WORKSPACE-}" ]; then
-    set_workspace "${WORKSPACE}"
-    check_workspace "${WORKSPACE}"
-  fi
-
   timeout --signal=INT --foreground 10m terraform apply "${plan_location}"
 
   popd || return "${ERROR_CHANGE_DIR}"

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

@@ -45,9 +45,20 @@ INSTALLER_RENDER_PATH="k8s.yaml" # k8s.yaml is hardcoded in post-prcess.sh - we
 
 # 1. Read versions from the file system. We rely on `leeway dev/preview:deploy-dependencies` to create this file for us
 # Or from the docker file if it doesn't exist
-# shellcheck disable=SC2050,SC2057
-if [ ! test -f "/tmp/versions.yaml" ]; then
-  docker run --rm "eu.gcr.io/gitpod-core-dev/build/versions:$VERSION" cat /versions.yaml > /tmp/versions.yaml
+# Or just build it and get it from there
+if ! test -f "/tmp/versions.yaml"; then
+  ec=0
+  docker run --rm "eu.gcr.io/gitpod-core-dev/build/versions:$VERSION" cat /versions.yaml > /tmp/versions.yaml || ec=$?
+  if [[ ec -ne 0 ]];then
+      VERSIONS_TMP_ZIP=$(mktemp "/tmp/XXXXXX.installer.tar.gz")
+      leeway build components:all-docker \
+                              --dont-test \
+                              -Dversion="${VERSION}" \
+                              -DSEGMENT_IO_TOKEN="$(kubectl --context=dev -n werft get secret self-hosted -o jsonpath='{.data.segmentIOToken}' | base64 -d)" \
+                              --save "${VERSIONS_TMP_ZIP}"
+      tar -xzvf "${VERSIONS_TMP_ZIP}" ./versions.yaml && sudo mv ./versions.yaml /tmp/versions.yaml
+      rm "${VERSIONS_TMP_ZIP}"
+  fi
 fi
 
 if ! command -v installer;then

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

@@ -19,7 +19,7 @@ if [[ -n ${WERFT_SERVICE_HOST+x} ]]; then
   export TF_IN_AUTOMATION=true
 fi
 
-WORKSPACE="${TF_VAR_preview_name:-$WORKSPACE}"
+export TF_WORKSPACE="${TF_VAR_preview_name:-TF_WORKSPACE}"
 TARGET_DIR="${PROJECT_ROOT}/dev/preview/infrastructure/harvester"
 # Setting the TF_DATA_DIR is advisable if we set the PLAN_LOCATION in a different place than the dir with the tf
 TF_DATA_DIR="${TARGET_DIR}"
@@ -54,8 +54,8 @@ case ${PLAN_EXIT_CODE} in
   ;;
 esac
 
-if [ -n "${DESTROY-}" ] && [ -n "${WORKSPACE}" ]; then
+if [ -n "${DESTROY-}" ] && [ -n "${TF_WORKSPACE}" ]; then
   pushd "${TARGET_DIR}"
-  delete_workspace "${WORKSPACE}"
+  delete_workspace "${TF_WORKSPACE}"
   popd
 fi