chore: update naming conventions and clean up variables in sandboxes and examples

Author: mahauber

CODEOWNERS

@@ -0,0 +1,3 @@
+*         david.wenzel@stackit.cloud @mahauber
+docs/*    @lweberru
+scripts/* @lweberru

examples/01-standalone/main.tf

@@ -47,7 +47,7 @@ module "devops" {
 module "sandboxes" {
   source = "../../modules/sandboxes"
 
-  naming_pattern      = "${var.company_code}-sbx"
+  naming_prefix      = "${var.company_code}-sbx"
   parent_container_id = module.governance.folder_container_ids.sandbox
   sandboxes           = var.sandboxes
 }

examples/02-hub-spoke/main.tf

@@ -33,9 +33,9 @@ module "management" {
 module "connectivity_global" {
   source = "../../modules/connectivity-global"
 
-  organization_id       = var.organization_id
-  labels                = var.labels
-  network_areas         = var.network_areas
+  organization_id = var.organization_id
+  labels          = var.labels
+  network_areas   = var.network_areas
 }
 
 #############################
@@ -80,7 +80,7 @@ module "devops" {
 module "sandboxes" {
   source = "../../modules/sandboxes"
 
-  naming_pattern      = "${var.company_code}-sbx"
+  naming_prefix       = "${var.company_code}-sbx"
   parent_container_id = module.governance.folder_container_ids.sandbox
   sandboxes           = var.sandboxes
 }
@@ -93,8 +93,9 @@ module "landing_zone" {
   source   = "../../modules/landing-zone"
   for_each = var.landing_zones
 
-  parent_container_id   = module.governance.folder_container_ids.landing_zones_public
+  parent_container_id   = each.value.corporate ? module.governance.folder_container_ids.landing_zones_corporate : module.governance.folder_container_ids.landing_zones_public
   naming_pattern        = "${var.company_code}-lz-${each.value.project_code}-${each.value.env}"
+  network_area_id       = each.value.corporate ? module.connectivity_global.network_area_ids[var.connectivity_regional_network_area] : null
   owner_email           = each.value.owner_email
   labels                = var.labels
   role_assignments      = each.value.role_assignments

examples/02-hub-spoke/variables.tf

@@ -52,15 +52,9 @@ variable "platform_admins" {
   default     = []
 }
 
-variable "landing_zone_admins" {
-  type        = list(string)
-  description = "List of landing zone administrators."
-  default     = []
-}
-
-##############################
-## CONNECTIVITY - GLOBAL    ##
-##############################
+###########################
+## CONNECTIVITY - GLOBAL ##
+###########################
 
 variable "network_areas" {
   type = list(object({
@@ -75,9 +69,9 @@ variable "network_areas" {
   description = "List of network areas to create with their IP ranges and configuration."
 }
 
-################################
-## CONNECTIVITY - REGIONAL    ##
-################################
+#############################
+## CONNECTIVITY - REGIONAL ##
+#############################
 
 variable "connectivity_regional_network_area" {
   type        = string
@@ -144,46 +138,6 @@ variable "landing_zones" {
       description = string
       permissions = list(string)
     })), [])
-    kubernetes_clusters = optional(map(object({
-      kubernetes_version                   = string
-      enable_kubernetes_version_updates    = optional(bool, true)
-      enable_machine_image_version_updates = optional(bool, true)
-      hibernations = optional(list(object({
-        start    = string
-        end      = string
-        timezone = optional(string, "Europe/Berlin")
-      })), [])
-      node_pools = list(object({
-        name               = string
-        machine_type       = string
-        availability_zones = list(string)
-        os_version_min     = optional(string)
-        minimum            = number
-        maximum            = number
-        max_surge          = optional(number)
-        max_unavailable    = optional(number)
-        labels             = optional(map(string))
-        taints = optional(list(object({
-          key    = string
-          value  = string
-          effect = string
-        })))
-      }))
-      extensions = optional(object({
-        acl = optional(object({
-          allowed_cidrs = list(string)
-          enabled       = bool
-        }))
-        dns = optional(object({
-          enabled = bool
-          zones   = optional(list(string))
-        }))
-        observability = optional(object({
-          enabled     = bool
-          instance_id = optional(string)
-        }))
-      }))
-    })), {})
   }))
   description = "Map of landing zones to create. Set corporate = true for network area connectivity, false for public."
   default     = {}

modules/sandboxes/main.tf

@@ -6,7 +6,7 @@ resource "stackit_resourcemanager_project" "this" {
   for_each = { for sandbox in var.sandboxes : sandbox.project_name => sandbox }
 
   parent_container_id = var.parent_container_id
-  name                = "${var.naming_pattern}-${each.value.project_name}"
+  name                = "${var.naming_prefix}-${each.value.project_name}"
   owner_email         = each.value.project_owner_email
 
   lifecycle {

modules/sandboxes/variables.tf

@@ -3,15 +3,9 @@ variable "parent_container_id" {
   description = "Parent container ID (folder or organization) where the project will be created."
 }
 
-variable "naming_pattern" {
+variable "naming_prefix" {
   type        = string
-  description = "Naming prefix for all resources in this module, e.g. \"myco-pltfm-net-prod\"."
-}
-
-variable "project_name" {
-  type        = string
-  description = "Name of the STACKIT project to create."
-  default     = null
+  description = "Naming prefix for all resources in this module."
 }
 
 variable "sandboxes" {