diff --git a/hack/prepare-remote-cluster-for-integration-tests.sh b/hack/prepare-remote-cluster-for-integration-tests.sh index c063264d5..3a99ae8dc 100755 --- a/hack/prepare-remote-cluster-for-integration-tests.sh +++ b/hack/prepare-remote-cluster-for-integration-tests.sh @@ -240,7 +240,7 @@ gke | aks | eks) log_note "KUBECONFIG='$KUBECONFIG' TEST_ENV_PATH='/tmp/integration-test-env' SOURCE_PATH='$pinniped_repo' $ROOT/pipelines/shared-tasks/run-integration-tests/task.sh" ;; kind) - log_note "KUBECONFIG='$KUBECONFIG' TEST_ENV_PATH='/tmp/integration-test-env' SOURCE_PATH='$pinniped_repo' START_GCLOUD_PROXY=yes GCP_PROJECT=$PINNIPED_GCP_PROJECT GCP_ZONE=us-west1-b $ROOT/pipelines/shared-tasks/run-integration-tests/task.sh" + log_note "KUBECONFIG='$KUBECONFIG' TEST_ENV_PATH='/tmp/integration-test-env' SOURCE_PATH='$pinniped_repo' START_GCLOUD_PROXY=yes GCP_PROJECT=$PINNIPED_GCP_PROJECT GCP_ZONE=us-west1-a $ROOT/pipelines/shared-tasks/run-integration-tests/task.sh" ;; *) log_error "Huh? Should never get here." diff --git a/hack/remote-workstation/create.sh b/hack/remote-workstation/create.sh index c08fc8886..8b0c86130 100755 --- a/hack/remote-workstation/create.sh +++ b/hack/remote-workstation/create.sh @@ -13,7 +13,7 @@ fi instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" instance_user="${REMOTE_INSTANCE_USERNAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Create a VM called $instance_name with some reasonable compute power and disk. diff --git a/hack/remote-workstation/delete.sh b/hack/remote-workstation/delete.sh index 5ddc51943..7b1e48bf3 100755 --- a/hack/remote-workstation/delete.sh +++ b/hack/remote-workstation/delete.sh @@ -12,7 +12,7 @@ fi instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" # Delete the instance forever. Will prompt for confirmation. echo "Destroying VM $instance_name..." diff --git a/hack/remote-workstation/rsync-to-local.sh b/hack/remote-workstation/rsync-to-local.sh index d3bbc5ee8..b7898229d 100755 --- a/hack/remote-workstation/rsync-to-local.sh +++ b/hack/remote-workstation/rsync-to-local.sh @@ -19,7 +19,7 @@ dest_dir="./workspace/pinniped" instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" instance_user="${REMOTE_INSTANCE_USERNAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" config_file="/tmp/gcp-ssh-config" here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/hack/remote-workstation/rsync.sh b/hack/remote-workstation/rsync.sh index f3cacf6bf..63d89d7e0 100755 --- a/hack/remote-workstation/rsync.sh +++ b/hack/remote-workstation/rsync.sh @@ -18,7 +18,7 @@ dest_dir="./workspace" instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" instance_user="${REMOTE_INSTANCE_USERNAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" config_file="/tmp/gcp-ssh-config" here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/hack/remote-workstation/ssh.sh b/hack/remote-workstation/ssh.sh index 1a9d68b67..43c92340f 100755 --- a/hack/remote-workstation/ssh.sh +++ b/hack/remote-workstation/ssh.sh @@ -13,7 +13,7 @@ fi instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" instance_user="${REMOTE_INSTANCE_USERNAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" # Run ssh with identities forwarded so you can use them with git on the remote host. # Optionally run an arbitrary command on the remote host. diff --git a/hack/remote-workstation/start.sh b/hack/remote-workstation/start.sh index e8e0e087b..169e9f78b 100755 --- a/hack/remote-workstation/start.sh +++ b/hack/remote-workstation/start.sh @@ -12,7 +12,7 @@ fi instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" # Start an instance which was previously stopped to save money. echo "Starting VM $instance_name..." diff --git a/hack/remote-workstation/stop.sh b/hack/remote-workstation/stop.sh index 32ba7c636..4951c87b3 100755 --- a/hack/remote-workstation/stop.sh +++ b/hack/remote-workstation/stop.sh @@ -12,7 +12,7 @@ fi instance_name="${REMOTE_INSTANCE_NAME:-${USER}}" project="$PINNIPED_GCP_PROJECT" -zone="us-west1-b" +zone="us-west1-a" # Stop the instance, to save money, in a way that it can be restarted. echo "Stopping VM $instance_name..." diff --git a/pipelines/concourse-workers/pipeline.yml b/pipelines/concourse-workers/pipeline.yml index 400025db0..aa9a485c3 100644 --- a/pipelines/concourse-workers/pipeline.yml +++ b/pipelines/concourse-workers/pipeline.yml @@ -16,7 +16,7 @@ meta: # GCP account info and which zone the workers should be created in and deleted from. gcp_account_params: &gcp_account_params - INSTANCE_ZONE: us-west1-b + INSTANCE_ZONE: us-west1-a GCP_PROJECT: ((gcp-project-name)) GCP_USERNAME: ((gcp-instance-admin-username)) GCP_JSON_KEY: ((gcp-instance-admin-json-key)) diff --git a/pipelines/kind-node-builder/pipeline.yml b/pipelines/kind-node-builder/pipeline.yml index cf30d3711..cdfac3955 100644 --- a/pipelines/kind-node-builder/pipeline.yml +++ b/pipelines/kind-node-builder/pipeline.yml @@ -18,7 +18,7 @@ meta: # GCP account info and which zone the workers should be created in and deleted from. gcp_account_params: &gcp_account_params - INSTANCE_ZONE: us-west1-b + INSTANCE_ZONE: us-west1-a GCP_PROJECT: ((gcp-project-name)) GCP_USERNAME: ((gcp-instance-admin-username)) GCP_JSON_KEY: ((gcp-instance-admin-json-key)) diff --git a/pipelines/main/pipeline.yml b/pipelines/main/pipeline.yml index c41db3a5f..818de7f7c 100644 --- a/pipelines/main/pipeline.yml +++ b/pipelines/main/pipeline.yml @@ -92,8 +92,8 @@ meta: # GCP account info and which zone the kind workers should be created in and deleted from. gcp_account_params: &gcp_account_params - INSTANCE_ZONE: us-west1-b # which zone the kind worker VMs should be created in and deleted from - GCP_ZONE: us-west1-b + INSTANCE_ZONE: us-west1-a # which zone the kind worker VMs should be created in and deleted from + GCP_ZONE: us-west1-a GCP_PROJECT: ((gcp-project-name)) GCP_USERNAME: ((gcp-instance-admin-username)) GCP_JSON_KEY: ((gcp-instance-admin-json-key)) diff --git a/pipelines/pull-requests/pipeline.yml b/pipelines/pull-requests/pipeline.yml index 7e7b1e7de..1245d887d 100644 --- a/pipelines/pull-requests/pipeline.yml +++ b/pipelines/pull-requests/pipeline.yml @@ -80,8 +80,8 @@ meta: # GCP account info and which zone the workers should be created in and deleted from. gcp_account_params: &gcp_account_params - INSTANCE_ZONE: us-west1-b # which zone the kind worker VMs should be created in and deleted from - GCP_ZONE: us-west1-b + INSTANCE_ZONE: us-west1-a # which zone the kind worker VMs should be created in and deleted from + GCP_ZONE: us-west1-a GCP_PROJECT: ((gcp-project-name)) GCP_USERNAME: ((gcp-instance-admin-username)) GCP_JSON_KEY: ((gcp-instance-admin-json-key))