cleanup

dev/preview/BUILD.yaml

@@ -26,7 +26,7 @@ scripts:
       export GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS:-$PREVIEW_ENV_DEV_SA_KEY_PATH}"
       export TF_VAR_cert_issuer="${TF_VAR_cert_issuer:-letsencrypt-issuer-gitpod-core-dev}"
       export TF_VAR_preview_name="${TF_VAR_preview_name:-$(previewctl get name)}"
-      ./workflow/preview/deploy-harvester.sh
+      ./workflow/preview/deploy-preview.sh
 
   - name: delete-preview
     description: Delete an existing preview environment
@@ -35,7 +35,7 @@ scripts:
       export GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS:-$PREVIEW_ENV_DEV_SA_KEY_PATH}"
       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
+      ./workflow/preview/deploy-preview.sh
 
   - name: deploy-gitpod
     description: Deploys Gitpod to an existing preview environment

dev/preview/infrastructure/modules/dns/variables.tf

@@ -5,12 +5,12 @@ variable "preview_name" {
 
 variable "preview_ip" {
   type        = string
-  description = "IP for the preview env: ingress in Harvester cluster, or machine ip"
+  description = "IP for the preview env: ingress in cluster, or machine ip"
 }
 
 variable "workspace_ip" {
   type        = string
-  description = "IP for the workspace: LB in dev cluster for Harvester previews, or machine ip"
+  description = "IP for the workspace: LB in dev cluster for previews, or machine ip"
 }
 
 variable "cert_issuer" {

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

@@ -24,7 +24,7 @@ TARGET_DIR="${PROJECT_ROOT}/dev/preview/infrastructure"
 # 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}"
 
-# Illustration purposes, but this will set the plan location to $TARGET_DIR/harvester.plan if PLAN_LOCATION is not set
+# Illustration purposes, but this will set the plan location to $TARGET_DIR/infrastructure.plan if PLAN_LOCATION is not set
 static_plan="$(realpath "${TARGET_DIR}")/$(basename "${TARGET_DIR}").plan"
 PLAN_LOCATION="${PLAN_LOCATION:-$static_plan}"
 

dev/preview/workflow/preview/post-process.sh

@@ -11,7 +11,6 @@ set -euo pipefail
 # Node pool index was only relevant with core-dev
 NODE_POOL_INDEX=0
 
-# These were previously using "findLastPort" etc. but in harvester-based preview environments they can be stable
 REG_DAEMON_PORT="31750"
 
 # Required params