doc-1876: changes to data.tf, terraform.tfvars and clusters.tf files

.gitleaksignore

@@ -0,0 +1,2 @@
+4f4f656d6334f610851cfdc9fdb50873afe84fc5:terraform/getting-started-deployment-tf/terraform.tfvars:generic-api-key:17
+9096ba0e71a924f1eca78584934e8d1f848de2cc:terraform/getting-started-deployment-tf/terraform.tfvars:generic-api-key:16

packs/hello-universe-pack/values.yaml

@@ -10,4 +10,4 @@ manifests:
   hello-universe:
     registry: ghcr.io
     repository: spectrocloud/hello-universe
-    tag: 1.0.12
+    tag: 1.2.0

terraform/cluster-profile-variables-tf/cluster_profiles.tf

@@ -8,12 +8,12 @@ resource "spectrocloud_cluster_profile" "aws-profile" {
   count = var.deploy-aws ? 1 : 0
 
 
-  name        = "aws-profile-var-tf" 
+  name        = "aws-profile-var-tf"
   description = "A basic cluster profile for AWS"
   tags        = concat(var.tags, ["env:aws"])
   cloud       = "aws"
   type        = "cluster"
-  version     = "1.0.0" 
+  version     = "1.0.0"
   pack {
     name   = data.spectrocloud_pack.aws_ubuntu.name
     tag    = data.spectrocloud_pack.aws_ubuntu.version
@@ -45,12 +45,12 @@ resource "spectrocloud_cluster_profile" "aws-profile" {
     values = data.spectrocloud_pack.aws_csi.values
     type   = "spectro"
   }
-    pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+  pack {
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-default.yaml")
-    type = "oci"
+    type   = "oci"
   }
 }
 
@@ -66,7 +66,7 @@ resource "spectrocloud_cluster_profile" "aws-profile-var" {
   tags        = concat(var.tags, ["env:aws"])
   cloud       = "aws"
   type        = "cluster"
-  version     = "1.1.0" 
+  version     = "1.1.0"
 
   pack {
     name   = data.spectrocloud_pack.aws_ubuntu.name
@@ -101,11 +101,11 @@ resource "spectrocloud_cluster_profile" "aws-profile-var" {
   }
 
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
   profile_variables {
     variable {
@@ -181,18 +181,18 @@ resource "spectrocloud_cluster_profile" "azure-profile" {
   }
 
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
-pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+  pack {
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-default.yaml")
-    type = "oci"
+    type   = "oci"
   }
 }
 
@@ -242,18 +242,18 @@ resource "spectrocloud_cluster_profile" "azure-profile-var" {
   }
 
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
   profile_variables {
     variable {
@@ -330,11 +330,11 @@ resource "spectrocloud_cluster_profile" "gcp-profile" {
   }
 
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-default.yaml")
-    type = "oci"
+    type   = "oci"
   }
 }
 
@@ -384,18 +384,18 @@ resource "spectrocloud_cluster_profile" "gcp-profile-var" {
   }
 
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
   pack {
-    name = data.spectrocloud_pack.wordpress_chart.name
-    tag  = data.spectrocloud_pack.wordpress_chart.version
-    uid  = data.spectrocloud_pack.wordpress_chart.id
+    name   = data.spectrocloud_pack.wordpress_chart.name
+    tag    = data.spectrocloud_pack.wordpress_chart.version
+    uid    = data.spectrocloud_pack.wordpress_chart.id
     values = file("manifests/wordpress-variables.yaml")
-    type = "oci"
+    type   = "oci"
   }
   profile_variables {
     variable {

terraform/cluster-profile-variables-tf/clusters.tf

@@ -48,7 +48,7 @@ resource "spectrocloud_cluster_aws" "aws-cluster" {
 # Azure Cluster 
 ###############
 resource "spectrocloud_cluster_azure" "azure-cluster" {
- count = var.deploy-azure ? 1 : 0
+  count = var.deploy-azure ? 1 : 0
 
   name             = "azure-cluster-var-tf"
   tags             = concat(var.tags, ["env:azure"])

terraform/cluster-profile-variables-tf/inputs.tf

@@ -310,7 +310,7 @@ variable "wordpress_replica" {
   description = "The number of pods to be created."
 
   validation {
-    condition     = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_replica != "REPLACE ME" && var.wordpress_replica >=1 : true
+    condition     = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_replica != "REPLACE ME" && var.wordpress_replica >= 1 : true
     error_message = "The number of WordPress replicas must be at least 1 or more."
   }
 }
@@ -331,7 +331,7 @@ variable "wordpress_port" {
   description = "The port for the WordPress application."
 
   validation {
-    condition     = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_port != "REPLACE ME" && var.wordpress_port >=1 : true
+    condition     = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_port != "REPLACE ME" && var.wordpress_port >= 1 : true
     error_message = "Set the port number for WordPress"
   }
 }

terraform/cluster-profile-variables-tf/terraform.tfvars

@@ -55,7 +55,7 @@ azure_resource_group     = "REPLACE ME"
 azure_control_plane_nodes = {
   count               = "1"
   control_plane       = true
-  instance_type       = "Standard_A8_v2"
+  instance_type       = "Standard_D4s_v3"
   disk_size_gb        = "60"
   azs                 = ["1"] # If you want to deploy to multiple AZs, add them here.
   is_system_node_pool = false
@@ -64,7 +64,7 @@ azure_control_plane_nodes = {
 azure_worker_nodes = {
   count               = "1"
   control_plane       = false
-  instance_type       = "Standard_A8_v2"
+  instance_type       = "Standard_D4s_v3"
   disk_size_gb        = "60"
   azs                 = ["1"] # If you want to deploy to multiple AZs, add them here.
   is_system_node_pool = false
@@ -83,15 +83,15 @@ gcp_project_name       = "REPLACE ME"
 gcp_control_plane_nodes = {
   count              = "1"
   control_plane      = true
-  instance_type      = "e2-standard-4"
+  instance_type      = "n2-standard-4"
   disk_size_gb       = "60"
   availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-central1-a", "us-central1-b"].
 }
 
 gcp_worker_nodes = {
   count              = "1"
   control_plane      = false
-  instance_type      = "e2-standard-4"
+  instance_type      = "n2-standard-4"
   disk_size_gb       = "60"
   availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-central1-a", "us-central1-b"].
 }

terraform/cluster-profile-variables-tf/tests/aws-replace.tftest.hcl

@@ -3,8 +3,8 @@
 # Test case 4
 
 variables {
-  deploy-aws = true
-  deploy-aws-var = true
+  deploy-aws             = true
+  deploy-aws-var         = true
   aws-cloud-account-name = "REPLACE ME"
   aws-region             = "REPLACE ME"
   aws-key-pair-name      = "REPLACE ME"

terraform/cluster-profile-variables-tf/tests/aws.tftest.hcl

@@ -3,7 +3,7 @@
 # Test case 3
 
 variables {
-  deploy-aws = true
+  deploy-aws             = true
   aws-cloud-account-name = "test-account"
   aws-region             = "test-region"
   aws-key-pair-name      = "test-aws-key-pair"
@@ -31,13 +31,13 @@ run "verify_aws" {
   command = plan
 
   assert {
-        condition     = length(spectrocloud_cluster_profile.aws-profile) == 1
-        error_message = "No AWS cluster profile was created"
-    }
+    condition     = length(spectrocloud_cluster_profile.aws-profile) == 1
+    error_message = "No AWS cluster profile was created"
+  }
 
   assert {
-        condition     = length(spectrocloud_cluster_aws.aws-cluster) == 1
-        error_message = "No AWS cluster was created"
-    }
+    condition     = length(spectrocloud_cluster_aws.aws-cluster) == 1
+    error_message = "No AWS cluster was created"
+  }
 
 }

terraform/cluster-profile-variables-tf/tests/azure-replace.tftest.hcl

@@ -3,8 +3,8 @@
 # Test case 6
 
 variables {
-  deploy-azure = true
-  deploy-azure-var = true
+  deploy-azure             = true
+  deploy-azure-var         = true
   azure-cloud-account-name = "REPLACE ME"
   azure-region             = "REPLACE ME"
   azure_subscription_id    = "REPLACE ME"

terraform/cluster-profile-variables-tf/tests/azure.tftest.hcl

@@ -3,7 +3,7 @@
 # Test case 5
 
 variables {
-  deploy-azure = true
+  deploy-azure             = true
   azure-cloud-account-name = "test-account"
   azure-region             = "test-region"
   azure_subscription_id    = "test-azure-subscription-id"
@@ -18,18 +18,18 @@ run "verify_azure" {
   command = plan
 
   assert {
-        condition     = length(spectrocloud_cluster_profile.azure-profile) == 1
-        error_message = "No Azure cluster profile was created"
-    }
+    condition     = length(spectrocloud_cluster_profile.azure-profile) == 1
+    error_message = "No Azure cluster profile was created"
+  }
 
   assert {
-        condition     = length(spectrocloud_cluster_azure.azure-cluster) == 1
-        error_message = "No Azure cluster was created"
-    }
+    condition     = length(spectrocloud_cluster_azure.azure-cluster) == 1
+    error_message = "No Azure cluster was created"
+  }
 
   assert {
-        condition     = length(tls_private_key.tutorial_ssh_key_azure) == 1
-        error_message = "No Azure SSH key was created"
-    }
+    condition     = length(tls_private_key.tutorial_ssh_key_azure) == 1
+    error_message = "No Azure SSH key was created"
+  }
 
 }

terraform/cluster-profile-variables-tf/tests/gcp-replace.tftest.hcl

@@ -3,11 +3,11 @@
 # Test case 8
 
 variables {
-  deploy-gcp = true
-  deploy-gcp-var = true
+  deploy-gcp             = true
+  deploy-gcp-var         = true
   gcp-cloud-account-name = "REPLACE ME"
   gcp-region             = "REPLACE ME"
-  gcp_project_name      = "REPLACE ME"
+  gcp_project_name       = "REPLACE ME"
   gcp_control_plane_nodes = {
     count              = "1"
     control_plane      = true

terraform/cluster-profile-variables-tf/tests/gcp.tftest.hcl

@@ -3,11 +3,11 @@
 # Test case 7
 
 variables {
-  deploy-gcp = true
-  deploy-gcp-var = true
+  deploy-gcp             = true
+  deploy-gcp-var         = true
   gcp-cloud-account-name = "test-account"
   gcp-region             = "test-region"
-  gcp_project_name      = "test-aws-key-pair"
+  gcp_project_name       = "test-aws-key-pair"
   gcp_control_plane_nodes = {
     count              = "1"
     control_plane      = true
@@ -32,13 +32,13 @@ run "verify_gcp" {
   command = plan
 
   assert {
-        condition     = length(spectrocloud_cluster_profile.gcp-profile) == 1
-        error_message = "No GCP cluster profile was created"
-    }
+    condition     = length(spectrocloud_cluster_profile.gcp-profile) == 1
+    error_message = "No GCP cluster profile was created"
+  }
 
   assert {
-        condition     = length(spectrocloud_cluster_gcp.gcp-cluster) == 1
-        error_message = "No GCP cluster was created"
-    }
+    condition     = length(spectrocloud_cluster_gcp.gcp-cluster) == 1
+    error_message = "No GCP cluster was created"
+  }
 
 }

terraform/cluster-profile-variables-tf/tests/pack-and-profile.tftest.hcl

@@ -3,10 +3,10 @@
 # Test case 2
 
 variables {
-  deploy-aws = true
-  wordpress_namespace = "REPLACE ME"   
-  wordpress_replica = -1  
-  wordpress_port = -1 
+  deploy-aws             = true
+  wordpress_namespace    = "REPLACE ME"
+  wordpress_replica      = -1
+  wordpress_port         = -1
   aws-cloud-account-name = "test-account"
   aws-region             = "test-region"
   aws-key-pair-name      = "test-aws-key-pair"