From 5b6f4258ea05d50e9e10a20cb75dbf82b9b26f8d Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 15:10:34 +0100 Subject: [PATCH 1/7] Update variables --- .gitignore | 1 + 00-provider.tf | 6 +++++- 07-object-storage.tf | 2 +- 80-keypair.tf | 2 +- 99-variables.tf | 10 ++++++++++ project/00-provider.tf | 2 +- project/01-sna.tf | 2 +- project/02-project.tf | 8 ++++---- project/99-variables.tf | 5 +++++ 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9b68eaa..7eedae6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ terraform.tfstate.backup .terraform* .terraform/ *.qcow2 +*.tfvars diff --git a/00-provider.tf b/00-provider.tf index 20c31ea..6f07355 100644 --- a/00-provider.tf +++ b/00-provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { stackit = { source = "stackitcloud/stackit" - version = ">=0.50.0" + version = ">=0.69.0" } } } @@ -20,4 +20,8 @@ provider "stackit" { module "project" { source = "./project" + default_region = var.default_region + service_account_key_path = var.service_account_key_path + name_prefix = var.name_prefix + organization_id = var.organization_id } diff --git a/07-object-storage.tf b/07-object-storage.tf index 0e1c837..7a42843 100644 --- a/07-object-storage.tf +++ b/07-object-storage.tf @@ -1,6 +1,6 @@ resource "stackit_objectstorage_bucket" "example" { project_id = module.project.project_info["project3"].project_id - name = "project-core-testbucket444" + name = "${var.name_prefix}-project-core-testbucket-06-11-25" } resource "stackit_objectstorage_credentials_group" "example" { diff --git a/80-keypair.tf b/80-keypair.tf index a9ddfbb..f5cd9cf 100644 --- a/80-keypair.tf +++ b/80-keypair.tf @@ -1,6 +1,6 @@ // keypair adding to the server resource "stackit_key_pair" "keypair" { name = "pubkeyforauth" - public_key = chomp(file("/root/.ssh/id_ed25519.pub")) + public_key = chomp(file("${var.public_key_file}")) } diff --git a/99-variables.tf b/99-variables.tf index 5b3415b..fc576bc 100644 --- a/99-variables.tf +++ b/99-variables.tf @@ -1,4 +1,10 @@ # -- variables + +variable "name_prefix" { + type = string + default = "test-landing-zone" +} + variable "organization_id" { default = "" } @@ -33,3 +39,7 @@ variable "flavor" { default = "m1.2" } +variable "public_key_file" { + type = string +} + diff --git a/project/00-provider.tf b/project/00-provider.tf index c4d763b..6711d9a 100644 --- a/project/00-provider.tf +++ b/project/00-provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { stackit = { source = "stackitcloud/stackit" - version = ">=0.50.0" + version = ">=0.69.0" } } } diff --git a/project/01-sna.tf b/project/01-sna.tf index 676c575..9d0749c 100644 --- a/project/01-sna.tf +++ b/project/01-sna.tf @@ -5,7 +5,7 @@ resource "stackit_network_area" "sna" { organization_id = var.organization_id - name = "project_sna" + name = "${var.name_prefix}_project_sna" network_ranges = [ { prefix = "10.220.0.0/16" diff --git a/project/02-project.tf b/project/02-project.tf index 6204925..5b47c89 100644 --- a/project/02-project.tf +++ b/project/02-project.tf @@ -7,19 +7,19 @@ variable "projects" { })) default = { project1 = { - name = "landingzone" + name = "grossda_landingzone" owner_email = "michael.sodan@stackit.cloud" } project2 = { - name = "core" + name = "grossda_core" owner_email = "michael.sodan@stackit.cloud" } project3 = { - name = "backup" + name = "grossda_backup" owner_email = "michael.sodan@stackit.cloud" } project4 = { - name = "ske" + name = "grossda_ske" owner_email = "markus.brunsch@stackit.cloud" } } diff --git a/project/99-variables.tf b/project/99-variables.tf index 73291b0..79ac255 100644 --- a/project/99-variables.tf +++ b/project/99-variables.tf @@ -1,4 +1,9 @@ # -- variables +variable "name_prefix" { + type = string + default = "test-landing-zone" +} + variable "organization_id" { default = "" } -- 2.45.4 From 3cd023d463d5be2507f2267a6a24ab367d17d433 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 15:37:49 +0100 Subject: [PATCH 2/7] Update node type --- 08-ske.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/08-ske.tf b/08-ske.tf index df82afc..afdc807 100644 --- a/08-ske.tf +++ b/08-ske.tf @@ -1,10 +1,10 @@ resource "stackit_ske_cluster" "demo-cluster" { project_id = module.project.project_info["project4"].project_id - name = "demo-clustr" + name = "demo-cluster" node_pools = [ { name = "np" - machine_type = "g1.4" + machine_type = "g2i.4" minimum = "2" maximum = "3" volume_size = "64" -- 2.45.4 From 30abd89cb188495e85e1551e54f8cb3879084019 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 15:38:04 +0100 Subject: [PATCH 3/7] Update bucket name --- 07-object-storage.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/07-object-storage.tf b/07-object-storage.tf index 7a42843..3212a18 100644 --- a/07-object-storage.tf +++ b/07-object-storage.tf @@ -1,6 +1,6 @@ resource "stackit_objectstorage_bucket" "example" { project_id = module.project.project_info["project3"].project_id - name = "${var.name_prefix}-project-core-testbucket-06-11-25" + name = "${var.name_prefix}-project-core-06-11-25" } resource "stackit_objectstorage_credentials_group" "example" { -- 2.45.4 From 0eedd5aea978bea05f346290393cd9ed9af8c192 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 17:18:34 +0100 Subject: [PATCH 4/7] Fix cluster name --- 08-ske.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/08-ske.tf b/08-ske.tf index afdc807..95a70b8 100644 --- a/08-ske.tf +++ b/08-ske.tf @@ -1,6 +1,6 @@ resource "stackit_ske_cluster" "demo-cluster" { project_id = module.project.project_info["project4"].project_id - name = "demo-cluster" + name = "demo" node_pools = [ { name = "np" @@ -34,9 +34,9 @@ output "ske-egress-ip" { } resource "stackit_network" "ske_network" { - project_id = module.project.project_info["project4"].project_id - name = "ske_network" - ipv4_nameservers = ["1.1.1.1", "9.9.9.9"] - ipv4_prefix = "10.220.10.0/24" + project_id = module.project.project_info["project4"].project_id + name = "ske_network" + ipv4_nameservers = ["1.1.1.1", "9.9.9.9"] + ipv4_prefix = "10.220.10.0/24" } -- 2.45.4 From df422a2df5945af3e5d0c0f3d19efa4de35e8b78 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 17:23:55 +0100 Subject: [PATCH 5/7] Add example tfvars --- terraform.tfvars.example | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 terraform.tfvars.example diff --git a/terraform.tfvars.example b/terraform.tfvars.example new file mode 100644 index 0000000..21f34f8 --- /dev/null +++ b/terraform.tfvars.example @@ -0,0 +1,5 @@ +organization_id="03a34540-3c1a-4794-b2c6-7111ecf824ef" +service_account_key_path = "/Users/test/.stackit/credentials.json" +public_key_file = "/Users/test/.ssh/test_landing_zone.pub" +name_prefix = "test" + -- 2.45.4 From bc092833f252cff7f941cc7bc334377b20e80fb4 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 17:29:01 +0100 Subject: [PATCH 6/7] Restore names --- project/02-project.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/02-project.tf b/project/02-project.tf index 5b47c89..d839326 100644 --- a/project/02-project.tf +++ b/project/02-project.tf @@ -7,19 +7,19 @@ variable "projects" { })) default = { project1 = { - name = "grossda_landingzone" + name = "test_landingzone" owner_email = "michael.sodan@stackit.cloud" } project2 = { - name = "grossda_core" + name = "test_core" owner_email = "michael.sodan@stackit.cloud" } project3 = { - name = "grossda_backup" + name = "test_backup" owner_email = "michael.sodan@stackit.cloud" } project4 = { - name = "grossda_ske" + name = "test_ske" owner_email = "markus.brunsch@stackit.cloud" } } -- 2.45.4 From a6a9f1642c8ef70f391d1a1a3ba9f04e039287b2 Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Thu, 6 Nov 2025 09:03:44 +0100 Subject: [PATCH 7/7] Remove name prefix --- 00-provider.tf | 1 - 07-object-storage.tf | 2 +- 99-variables.tf | 6 ------ project/01-sna.tf | 2 +- project/99-variables.tf | 5 ----- terraform.tfvars.example | 1 - 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/00-provider.tf b/00-provider.tf index 6f07355..b8e9999 100644 --- a/00-provider.tf +++ b/00-provider.tf @@ -22,6 +22,5 @@ module "project" { source = "./project" default_region = var.default_region service_account_key_path = var.service_account_key_path - name_prefix = var.name_prefix organization_id = var.organization_id } diff --git a/07-object-storage.tf b/07-object-storage.tf index 3212a18..a3bf714 100644 --- a/07-object-storage.tf +++ b/07-object-storage.tf @@ -1,6 +1,6 @@ resource "stackit_objectstorage_bucket" "example" { project_id = module.project.project_info["project3"].project_id - name = "${var.name_prefix}-project-core-06-11-25" + name = "project-core-06-11-25" } resource "stackit_objectstorage_credentials_group" "example" { diff --git a/99-variables.tf b/99-variables.tf index fc576bc..b747698 100644 --- a/99-variables.tf +++ b/99-variables.tf @@ -1,10 +1,4 @@ # -- variables - -variable "name_prefix" { - type = string - default = "test-landing-zone" -} - variable "organization_id" { default = "" } diff --git a/project/01-sna.tf b/project/01-sna.tf index 9d0749c..676c575 100644 --- a/project/01-sna.tf +++ b/project/01-sna.tf @@ -5,7 +5,7 @@ resource "stackit_network_area" "sna" { organization_id = var.organization_id - name = "${var.name_prefix}_project_sna" + name = "project_sna" network_ranges = [ { prefix = "10.220.0.0/16" diff --git a/project/99-variables.tf b/project/99-variables.tf index 79ac255..73291b0 100644 --- a/project/99-variables.tf +++ b/project/99-variables.tf @@ -1,9 +1,4 @@ # -- variables -variable "name_prefix" { - type = string - default = "test-landing-zone" -} - variable "organization_id" { default = "" } diff --git a/terraform.tfvars.example b/terraform.tfvars.example index 21f34f8..7369df5 100644 --- a/terraform.tfvars.example +++ b/terraform.tfvars.example @@ -1,5 +1,4 @@ organization_id="03a34540-3c1a-4794-b2c6-7111ecf824ef" service_account_key_path = "/Users/test/.stackit/credentials.json" public_key_file = "/Users/test/.ssh/test_landing_zone.pub" -name_prefix = "test" -- 2.45.4