Skip to content

Commit 47d1412

Browse files
authored
[preview] force gce when providing infrastructure, avoid harvester (#17475)
* [preview] force gce, no harvester * [preview] default to using spot for GCE VMs * [preview] bump sizes up now that we're using spot ...and actually use spot by changing the default for gce_use_spot We'll address the disk pressure issues (which cause pods to evict on install, but eventually succeed) in a separate PR.
1 parent feb7a1f commit 47d1412

File tree

5 files changed

+7
-46
lines changed

5 files changed

+7
-46
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ variable "preview_namespace" {
1515

1616
variable "vm_type" {
1717
type = string
18-
default = "n2d-standard-8"
18+
default = "n2d-standard-16"
1919
}
2020

2121
variable "ssh_key" {
@@ -61,7 +61,7 @@ variable "gcp_project_dns" {
6161

6262
variable "use_spot" {
6363
type = bool
64-
default = false
64+
default = true
6565
description = "Flag to decide whether to use spot instances"
6666
}
6767

dev/preview/infrastructure/modules/gce/vm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ locals {
8080
ssh_authorized_keys = var.ssh_key
8181
})
8282

83-
machine_type = var.with_large_vm ? "n2d-standard-16" : var.vm_type
83+
machine_type = var.with_large_vm ? "n2d-standard-32" : var.vm_type
8484
}

dev/preview/infrastructure/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ variable "dev_kube_context" {
2929

3030
variable "vm_type" {
3131
type = string
32-
default = "n2d-standard-8"
32+
default = "n2d-standard-16"
3333
}
3434

3535
variable "vm_image" {
@@ -52,7 +52,7 @@ variable "gcp_project_dns" {
5252

5353
variable "gce_use_spot" {
5454
type = bool
55-
default = false
55+
default = true
5656
description = "Flag to decide whether to use spot instances"
5757
}
5858

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ shopt -os allexport
3333

3434
terraform_init
3535

36-
source "${SCRIPT_PATH}/determine-env.sh"
36+
# avoid harvester entirely
37+
export TF_VAR_infra_provider="gce"
3738

3839
PLAN_EXIT_CODE=0
3940
terraform_plan || PLAN_EXIT_CODE=$?

dev/preview/workflow/preview/determine-env.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)