Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-06-22 13:14:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

terraform: allow for multiple instance groups (#1471)

Browse source
This commit is contained in:
3u13r 2023-03-21 22:56:03 +01:00 • committed by GitHub
parent 7a0cbe39f4
commit cf9970c051
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 74 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/internal/terraform/terraform/gcp/main.tf
View file

@ -146,6 +146,7 @@ module "instance_group_control_plane" {
disk_type = var.state_disk_type
network = google_compute_network.vpc_network.id
subnetwork = google_compute_subnetwork.vpc_subnetwork.id
alias_ip_range_name = google_compute_subnetwork.vpc_subnetwork.secondary_ip_range[0].range_name
kube_env = local.kube_env
debug = var.debug
named_ports = flatten([
@ -162,7 +163,7 @@ module "instance_group_control_plane" {
module "instance_group_worker" {
source = "./modules/instance_group"
name = local.name
name = "${local.name}-1"
role = "Worker"
uid = local.uid
instance_type = var.instance_type
@ -172,6 +173,7 @@ module "instance_group_worker" {
disk_type = var.state_disk_type
network = google_compute_network.vpc_network.id
subnetwork = google_compute_subnetwork.vpc_subnetwork.id
alias_ip_range_name = google_compute_subnetwork.vpc_subnetwork.secondary_ip_range[0].range_name
kube_env = local.kube_env
debug = var.debug
labels = local.labels

2
cli/internal/terraform/terraform/gcp/modules/instance_group/main.tf
View file

@ -52,7 +52,7 @@ resource "google_compute_instance_template" "template" {
subnetwork = var.subnetwork
alias_ip_range {
ip_cidr_range = "/24"
subnetwork_range_name = var.name
subnetwork_range_name = var.alias_ip_range_name
}
}

5
cli/internal/terraform/terraform/gcp/modules/instance_group/variables.tf
View file

@ -79,3 +79,8 @@ variable "debug" {
default = false
description = "Enable debug mode. This will enable serial port access on the instances."
}
variable "alias_ip_range_name" {
type = string
description = "Name of the alias IP range to use."
}

6
hack/terraform/gcp/internal-loadbalancer/main.tf
View file

@ -58,7 +58,9 @@ resource "random_password" "initSecret" {
resource "google_compute_network" "vpc_network" {
name = local.name
description = "Constellation VPC network"
auto_create_subnetworks = false
mtu = 8896
}
@ -162,6 +164,7 @@ module "instance_group_control_plane" {
disk_type = var.state_disk_type
network = google_compute_network.vpc_network.id
subnetwork = google_compute_subnetwork.vpc_subnetwork_backend.id
alias_ip_range_name = google_compute_subnetwork.vpc_subnetwork.secondary_ip_range[0].range_name
kube_env = local.kube_env
debug = var.debug
named_ports = flatten([
@ -178,7 +181,7 @@ module "instance_group_control_plane" {
module "instance_group_worker" {
source = "./modules/instance_group"
name = local.name
name = "${local.name}-1"
role = "Worker"
uid = local.uid
instance_type = var.instance_type
@ -188,6 +191,7 @@ module "instance_group_worker" {
disk_type = var.state_disk_type
network = google_compute_network.vpc_network.id
subnetwork = google_compute_subnetwork.vpc_subnetwork_backend.id
alias_ip_range_name = google_compute_subnetwork.vpc_subnetwork.secondary_ip_range[0].range_name
kube_env = local.kube_env
debug = var.debug
labels = local.labels

2
hack/terraform/gcp/internal-loadbalancer/modules/instance_group/main.tf
View file

@ -56,7 +56,7 @@ resource "google_compute_instance_template" "template" {
subnetwork = var.subnetwork
alias_ip_range {
ip_cidr_range = "/24"
subnetwork_range_name = var.name
subnetwork_range_name = var.alias_ip_range_name
}
}

5
hack/terraform/gcp/internal-loadbalancer/modules/instance_group/variables.tf
View file

@ -79,3 +79,8 @@ variable "debug" {
default = false
description = "Enable debug mode. This will enable serial port access on the instances."
}
variable "alias_ip_range_name" {
type = string
description = "Name of the alias IP range to use."
}