Merge pull request 'update-variables' (#1) from update-variables into main

Reviewed-on: #1

.gitignore

@@ -3,4 +3,5 @@ terraform.tfstate.backup
 .terraform*
 .terraform/
 *.qcow2
+*.tfvars
 

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,7 @@ provider "stackit" {
 
 module "project" {
   source = "./project"
+  default_region = var.default_region
+  service_account_key_path = var.service_account_key_path
+  organization_id = var.organization_id
 }

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       = "project-core-06-11-25"
 }
 
 resource "stackit_objectstorage_credentials_group" "example" {

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"
   node_pools = [
     {
       name               = "np"
-      machine_type       = "g1.4"
+      machine_type       = "g2i.4"
       minimum            = "2"
       maximum            = "3"
       volume_size        = "64"
@@ -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"
 }
 

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}"))
 }
 

99-variables.tf

@@ -33,3 +33,7 @@ variable "flavor" {
   default     = "m1.2"
 }
 
+variable "public_key_file" {
+  type = string
+}
+

project/00-provider.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     stackit = {
       source = "stackitcloud/stackit"
-      version = ">=0.50.0"
+      version = ">=0.69.0"
     }
   }
 }

project/02-project.tf

@@ -7,19 +7,19 @@ variable "projects" {
   }))
   default = {
     project1 = {
-      name        = "landingzone"
+      name        = "test_landingzone"
       owner_email = "michael.sodan@stackit.cloud"
     }
     project2 = {
-      name        = "core"
+      name        = "test_core"
       owner_email = "michael.sodan@stackit.cloud"
     }
     project3 = {
-      name        = "backup"
+      name        = "test_backup"
       owner_email = "michael.sodan@stackit.cloud"
     }
     project4 = {
-      name        = "ske"
+      name        = "test_ske"
       owner_email = "markus.brunsch@stackit.cloud"
     }
   }

terraform.tfvars.example

@@ -0,0 +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"
+