diff --git a/cli/internal/terraform/terraform/gcp/main.tf b/cli/internal/terraform/terraform/gcp/main.tf index 2d784c831..593b4ad23 100644 --- a/cli/internal/terraform/terraform/gcp/main.tf +++ b/cli/internal/terraform/terraform/gcp/main.tf @@ -128,6 +128,7 @@ module "instance_group_control_plane" { network = google_compute_network.vpc_network.id subnetwork = google_compute_subnetwork.vpc_subnetwork.id kube_env = local.kube_env + debug = var.debug named_ports = flatten([ { name = "kubernetes", port = local.ports_kubernetes }, { name = "bootstrapper", port = local.ports_bootstrapper }, @@ -151,6 +152,7 @@ module "instance_group_worker" { network = google_compute_network.vpc_network.id subnetwork = google_compute_subnetwork.vpc_subnetwork.id kube_env = local.kube_env + debug = var.debug } resource "google_compute_global_address" "loadbalancer_ip" { diff --git a/cli/internal/terraform/terraform/gcp/modules/instance_group/main.tf b/cli/internal/terraform/terraform/gcp/modules/instance_group/main.tf index 5501031df..c326bbaa4 100644 --- a/cli/internal/terraform/terraform/gcp/modules/instance_group/main.tf +++ b/cli/internal/terraform/terraform/gcp/modules/instance_group/main.tf @@ -43,6 +43,7 @@ resource "google_compute_instance_template" "template" { kube-env = var.kube_env constellation-uid = var.uid constellation-role = var.role + serial-port-enable = var.debug ? "TRUE" : "FALSE" } network_interface { @@ -77,8 +78,9 @@ resource "google_compute_instance_template" "template" { } } -resource "google_compute_instance_group_manager" "instance_group_manager" { +resource "google_compute_region_instance_group_manager" "instance_group_manager" { name = local.name + description = "Instance group manager for Constellation" base_instance_name = local.name target_size = var.instance_count diff --git a/cli/internal/terraform/terraform/gcp/modules/instance_group/outputs.tf b/cli/internal/terraform/terraform/gcp/modules/instance_group/outputs.tf index 66f793fb0..108899000 100644 --- a/cli/internal/terraform/terraform/gcp/modules/instance_group/outputs.tf +++ b/cli/internal/terraform/terraform/gcp/modules/instance_group/outputs.tf @@ -1,3 +1,3 @@ output "instance_group" { - value = google_compute_instance_group_manager.instance_group_manager.instance_group + value = google_compute_region_instance_group_manager.instance_group_manager.instance_group } diff --git a/cli/internal/terraform/terraform/gcp/modules/instance_group/variables.tf b/cli/internal/terraform/terraform/gcp/modules/instance_group/variables.tf index b091d0b47..a70784ed1 100644 --- a/cli/internal/terraform/terraform/gcp/modules/instance_group/variables.tf +++ b/cli/internal/terraform/terraform/gcp/modules/instance_group/variables.tf @@ -58,3 +58,9 @@ variable "named_ports" { default = [] description = "Named ports for the instance group." } + +variable "debug" { + type = bool + default = false + description = "Enable debug mode. This will enable serial port access on the instances." +}