From 7d35bacbbe9ad659efb7ce7fc9b072d5bbe1c045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Tue, 19 Nov 2024 00:13:29 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Allow=20setting=20min=20and=20ma?= =?UTF-8?q?x=20nodes=20per=20pool=20for=20mk8s=20mode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prepare-labs/settings/mk8s.env | 2 -- prepare-labs/terraform/many-kubernetes/locals.tf | 4 ++-- prepare-labs/terraform/many-kubernetes/variables.tf | 7 ++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/prepare-labs/settings/mk8s.env b/prepare-labs/settings/mk8s.env index 2291b441..b4d7de0c 100644 --- a/prepare-labs/settings/mk8s.env +++ b/prepare-labs/settings/mk8s.env @@ -1,5 +1,3 @@ -CLUSTERSIZE=2 - USER_LOGIN=k8s USER_PASSWORD= diff --git a/prepare-labs/terraform/many-kubernetes/locals.tf b/prepare-labs/terraform/many-kubernetes/locals.tf index 2da350f0..d8c88822 100644 --- a/prepare-labs/terraform/many-kubernetes/locals.tf +++ b/prepare-labs/terraform/many-kubernetes/locals.tf @@ -8,8 +8,8 @@ resource "random_string" "_" { resource "time_static" "_" {} locals { - min_nodes_per_pool = var.nodes_per_cluster - max_nodes_per_pool = var.nodes_per_cluster * 2 + min_nodes_per_pool = var.min_nodes_per_cluster + max_nodes_per_pool = var.max_nodes_per_cluster timestamp = formatdate("YYYY-MM-DD-hh-mm", time_static._.rfc3339) tag = random_string._.result # Common tags to be assigned to all resources diff --git a/prepare-labs/terraform/many-kubernetes/variables.tf b/prepare-labs/terraform/many-kubernetes/variables.tf index d20a8131..cae05b9c 100644 --- a/prepare-labs/terraform/many-kubernetes/variables.tf +++ b/prepare-labs/terraform/many-kubernetes/variables.tf @@ -7,11 +7,16 @@ variable "how_many_clusters" { default = 2 } -variable "nodes_per_cluster" { +variable "min_nodes_per_cluster" { type = number default = 2 } +variable "max_nodes_per_cluster" { + type = number + default = 4 +} + variable "node_size" { type = string default = "M"