Skip to content

[preview] force gce when providing infrastructure, avoid harvester #17475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2023
Merged

[preview] force gce when providing infrastructure, avoid harvester #17475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43386a3
[preview] force gce, no harvester
kylos101 May 3, 2023
2636d4a
[preview] default to using spot for GCE VMs
kylos101 May 3, 2023
179cc14
[preview] bump sizes up now that we're using spot
kylos101 May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/preview/infrastructure/modules/gce/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variable "preview_namespace" {

variable "vm_type" {
type = string
default = "n2d-standard-8"
default = "n2d-standard-16"
}

variable "ssh_key" {
Expand Down Expand Up @@ -61,7 +61,7 @@ variable "gcp_project_dns" {

variable "use_spot" {
type = bool
default = false
default = true
description = "Flag to decide whether to use spot instances"
}

Expand Down
2 changes: 1 addition & 1 deletion dev/preview/infrastructure/modules/gce/vm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ locals {
ssh_authorized_keys = var.ssh_key
})

machine_type = var.with_large_vm ? "n2d-standard-16" : var.vm_type
machine_type = var.with_large_vm ? "n2d-standard-32" : var.vm_type
}
4 changes: 2 additions & 2 deletions dev/preview/infrastructure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ variable "dev_kube_context" {

variable "vm_type" {
type = string
default = "n2d-standard-8"
default = "n2d-standard-16"
}

variable "vm_image" {
Expand All @@ -52,7 +52,7 @@ variable "gcp_project_dns" {

variable "gce_use_spot" {
type = bool
default = false
default = true
description = "Flag to decide whether to use spot instances"
}

Expand Down
3 changes: 2 additions & 1 deletion dev/preview/workflow/preview/deploy-harvester.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ shopt -os allexport

terraform_init

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

PLAN_EXIT_CODE=0
terraform_plan || PLAN_EXIT_CODE=$?
Expand Down
40 changes: 0 additions & 40 deletions dev/preview/workflow/preview/determine-env.sh
View file
Open in desktop

This file was deleted.