Skip to content

Commit 954a124

Browse files
Linus-SpectroCloudLinus-SpectroCloud
authored
feat: changes to data.tf, terraform.tfvars and clusters.tf files (#50)
* doc-1876: changes to data.tf, terraform.tfvars and clusters.tf files * doc-1876: removed db and API key * doc-1876: removed db and API key * doc-1876: removed db and API key pt 3 - gitleaks-scan * doc-1876: removed db and API key * doc-1876: added file .gitleakignore because of public hello-universe key * doc-1876: updated terraform.tfvars file * doc-1876: updated terraform.tfvars file * doc-1876: final changes * doc-1876: removed db and API key * doc-1876: updated .gitleaksignore * doc-1876: updated .gitleaksignore * doc-1876: updates as per Adelina suggestions * doc-1876: final terraform fmt
1 parent 8564dc0 commit 954a124

40 files changed

+327
-327
lines changed

‎.gitleaksignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
4f4f656d6334f610851cfdc9fdb50873afe84fc5:terraform/getting-started-deployment-tf/terraform.tfvars:generic-api-key:17
2+
9096ba0e71a924f1eca78584934e8d1f848de2cc:terraform/getting-started-deployment-tf/terraform.tfvars:generic-api-key:16

‎packs/hello-universe-pack/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ manifests:
1010
hello-universe:
1111
registry: ghcr.io
1212
repository: spectrocloud/hello-universe
13-
tag: 1.0.12
13+
tag: 1.2.0

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

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ resource "spectrocloud_cluster_profile" "aws-profile" {
88
count = var.deploy-aws ? 1 : 0
99

1010

11-
name = "aws-profile-var-tf"
11+
name = "aws-profile-var-tf"
1212
description = "A basic cluster profile for AWS"
1313
tags = concat(var.tags, ["env:aws"])
1414
cloud = "aws"
1515
type = "cluster"
16-
version = "1.0.0"
16+
version = "1.0.0"
1717
pack {
1818
name = data.spectrocloud_pack.aws_ubuntu.name
1919
tag = data.spectrocloud_pack.aws_ubuntu.version
@@ -45,12 +45,12 @@ resource "spectrocloud_cluster_profile" "aws-profile" {
4545
values = data.spectrocloud_pack.aws_csi.values
4646
type = "spectro"
4747
}
48-
pack {
49-
name = data.spectrocloud_pack.wordpress_chart.name
50-
tag = data.spectrocloud_pack.wordpress_chart.version
51-
uid = data.spectrocloud_pack.wordpress_chart.id
48+
pack {
49+
name = data.spectrocloud_pack.wordpress_chart.name
50+
tag = data.spectrocloud_pack.wordpress_chart.version
51+
uid = data.spectrocloud_pack.wordpress_chart.id
5252
values = file("manifests/wordpress-default.yaml")
53-
type = "oci"
53+
type = "oci"
5454
}
5555
}
5656

@@ -66,7 +66,7 @@ resource "spectrocloud_cluster_profile" "aws-profile-var" {
6666
tags = concat(var.tags, ["env:aws"])
6767
cloud = "aws"
6868
type = "cluster"
69-
version = "1.1.0"
69+
version = "1.1.0"
7070

7171
pack {
7272
name = data.spectrocloud_pack.aws_ubuntu.name
@@ -101,11 +101,11 @@ resource "spectrocloud_cluster_profile" "aws-profile-var" {
101101
}
102102

103103
pack {
104-
name = data.spectrocloud_pack.wordpress_chart.name
105-
tag = data.spectrocloud_pack.wordpress_chart.version
106-
uid = data.spectrocloud_pack.wordpress_chart.id
104+
name = data.spectrocloud_pack.wordpress_chart.name
105+
tag = data.spectrocloud_pack.wordpress_chart.version
106+
uid = data.spectrocloud_pack.wordpress_chart.id
107107
values = file("manifests/wordpress-variables.yaml")
108-
type = "oci"
108+
type = "oci"
109109
}
110110
profile_variables {
111111
variable {
@@ -181,18 +181,18 @@ resource "spectrocloud_cluster_profile" "azure-profile" {
181181
}
182182

183183
pack {
184-
name = data.spectrocloud_pack.wordpress_chart.name
185-
tag = data.spectrocloud_pack.wordpress_chart.version
186-
uid = data.spectrocloud_pack.wordpress_chart.id
184+
name = data.spectrocloud_pack.wordpress_chart.name
185+
tag = data.spectrocloud_pack.wordpress_chart.version
186+
uid = data.spectrocloud_pack.wordpress_chart.id
187187
values = file("manifests/wordpress-variables.yaml")
188-
type = "oci"
188+
type = "oci"
189189
}
190-
pack {
191-
name = data.spectrocloud_pack.wordpress_chart.name
192-
tag = data.spectrocloud_pack.wordpress_chart.version
193-
uid = data.spectrocloud_pack.wordpress_chart.id
190+
pack {
191+
name = data.spectrocloud_pack.wordpress_chart.name
192+
tag = data.spectrocloud_pack.wordpress_chart.version
193+
uid = data.spectrocloud_pack.wordpress_chart.id
194194
values = file("manifests/wordpress-default.yaml")
195-
type = "oci"
195+
type = "oci"
196196
}
197197
}
198198

@@ -242,18 +242,18 @@ resource "spectrocloud_cluster_profile" "azure-profile-var" {
242242
}
243243

244244
pack {
245-
name = data.spectrocloud_pack.wordpress_chart.name
246-
tag = data.spectrocloud_pack.wordpress_chart.version
247-
uid = data.spectrocloud_pack.wordpress_chart.id
245+
name = data.spectrocloud_pack.wordpress_chart.name
246+
tag = data.spectrocloud_pack.wordpress_chart.version
247+
uid = data.spectrocloud_pack.wordpress_chart.id
248248
values = file("manifests/wordpress-variables.yaml")
249-
type = "oci"
249+
type = "oci"
250250
}
251251
pack {
252-
name = data.spectrocloud_pack.wordpress_chart.name
253-
tag = data.spectrocloud_pack.wordpress_chart.version
254-
uid = data.spectrocloud_pack.wordpress_chart.id
252+
name = data.spectrocloud_pack.wordpress_chart.name
253+
tag = data.spectrocloud_pack.wordpress_chart.version
254+
uid = data.spectrocloud_pack.wordpress_chart.id
255255
values = file("manifests/wordpress-variables.yaml")
256-
type = "oci"
256+
type = "oci"
257257
}
258258
profile_variables {
259259
variable {
@@ -330,11 +330,11 @@ resource "spectrocloud_cluster_profile" "gcp-profile" {
330330
}
331331

332332
pack {
333-
name = data.spectrocloud_pack.wordpress_chart.name
334-
tag = data.spectrocloud_pack.wordpress_chart.version
335-
uid = data.spectrocloud_pack.wordpress_chart.id
333+
name = data.spectrocloud_pack.wordpress_chart.name
334+
tag = data.spectrocloud_pack.wordpress_chart.version
335+
uid = data.spectrocloud_pack.wordpress_chart.id
336336
values = file("manifests/wordpress-default.yaml")
337-
type = "oci"
337+
type = "oci"
338338
}
339339
}
340340

@@ -384,18 +384,18 @@ resource "spectrocloud_cluster_profile" "gcp-profile-var" {
384384
}
385385

386386
pack {
387-
name = data.spectrocloud_pack.wordpress_chart.name
388-
tag = data.spectrocloud_pack.wordpress_chart.version
389-
uid = data.spectrocloud_pack.wordpress_chart.id
387+
name = data.spectrocloud_pack.wordpress_chart.name
388+
tag = data.spectrocloud_pack.wordpress_chart.version
389+
uid = data.spectrocloud_pack.wordpress_chart.id
390390
values = file("manifests/wordpress-variables.yaml")
391-
type = "oci"
391+
type = "oci"
392392
}
393393
pack {
394-
name = data.spectrocloud_pack.wordpress_chart.name
395-
tag = data.spectrocloud_pack.wordpress_chart.version
396-
uid = data.spectrocloud_pack.wordpress_chart.id
394+
name = data.spectrocloud_pack.wordpress_chart.name
395+
tag = data.spectrocloud_pack.wordpress_chart.version
396+
uid = data.spectrocloud_pack.wordpress_chart.id
397397
values = file("manifests/wordpress-variables.yaml")
398-
type = "oci"
398+
type = "oci"
399399
}
400400
profile_variables {
401401
variable {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "spectrocloud_cluster_aws" "aws-cluster" {
4848
# Azure Cluster
4949
###############
5050
resource "spectrocloud_cluster_azure" "azure-cluster" {
51-
count = var.deploy-azure ? 1 : 0
51+
count = var.deploy-azure ? 1 : 0
5252

5353
name = "azure-cluster-var-tf"
5454
tags = concat(var.tags, ["env:azure"])

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ variable "wordpress_replica" {
310310
description = "The number of pods to be created."
311311

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

333333
validation {
334-
condition = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_port != "REPLACE ME" && var.wordpress_port >=1 : true
334+
condition = var.deploy-aws || var.deploy-azure || var.deploy-gcp ? var.wordpress_port != "REPLACE ME" && var.wordpress_port >= 1 : true
335335
error_message = "Set the port number for WordPress"
336336
}
337337
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ azure_resource_group = "REPLACE ME"
5555
azure_control_plane_nodes = {
5656
count = "1"
5757
control_plane = true
58-
instance_type = "Standard_A8_v2"
58+
instance_type = "Standard_D4s_v3"
5959
disk_size_gb = "60"
6060
azs = ["1"] # If you want to deploy to multiple AZs, add them here.
6161
is_system_node_pool = false
@@ -64,7 +64,7 @@ azure_control_plane_nodes = {
6464
azure_worker_nodes = {
6565
count = "1"
6666
control_plane = false
67-
instance_type = "Standard_A8_v2"
67+
instance_type = "Standard_D4s_v3"
6868
disk_size_gb = "60"
6969
azs = ["1"] # If you want to deploy to multiple AZs, add them here.
7070
is_system_node_pool = false
@@ -83,15 +83,15 @@ gcp_project_name = "REPLACE ME"
8383
gcp_control_plane_nodes = {
8484
count = "1"
8585
control_plane = true
86-
instance_type = "e2-standard-4"
86+
instance_type = "n2-standard-4"
8787
disk_size_gb = "60"
8888
availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-central1-a", "us-central1-b"].
8989
}
9090

9191
gcp_worker_nodes = {
9292
count = "1"
9393
control_plane = false
94-
instance_type = "e2-standard-4"
94+
instance_type = "n2-standard-4"
9595
disk_size_gb = "60"
9696
availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-central1-a", "us-central1-b"].
9797
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Test case 4
44

55
variables {
6-
deploy-aws = true
7-
deploy-aws-var = true
6+
deploy-aws = true
7+
deploy-aws-var = true
88
aws-cloud-account-name = "REPLACE ME"
99
aws-region = "REPLACE ME"
1010
aws-key-pair-name = "REPLACE ME"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Test case 3
44

55
variables {
6-
deploy-aws = true
6+
deploy-aws = true
77
aws-cloud-account-name = "test-account"
88
aws-region = "test-region"
99
aws-key-pair-name = "test-aws-key-pair"
@@ -31,13 +31,13 @@ run "verify_aws" {
3131
command = plan
3232

3333
assert {
34-
condition = length(spectrocloud_cluster_profile.aws-profile) == 1
35-
error_message = "No AWS cluster profile was created"
36-
}
34+
condition = length(spectrocloud_cluster_profile.aws-profile) == 1
35+
error_message = "No AWS cluster profile was created"
36+
}
3737

3838
assert {
39-
condition = length(spectrocloud_cluster_aws.aws-cluster) == 1
40-
error_message = "No AWS cluster was created"
41-
}
39+
condition = length(spectrocloud_cluster_aws.aws-cluster) == 1
40+
error_message = "No AWS cluster was created"
41+
}
4242

4343
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Test case 6
44

55
variables {
6-
deploy-azure = true
7-
deploy-azure-var = true
6+
deploy-azure = true
7+
deploy-azure-var = true
88
azure-cloud-account-name = "REPLACE ME"
99
azure-region = "REPLACE ME"
1010
azure_subscription_id = "REPLACE ME"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Test case 5
44

55
variables {
6-
deploy-azure = true
6+
deploy-azure = true
77
azure-cloud-account-name = "test-account"
88
azure-region = "test-region"
99
azure_subscription_id = "test-azure-subscription-id"
@@ -18,18 +18,18 @@ run "verify_azure" {
1818
command = plan
1919

2020
assert {
21-
condition = length(spectrocloud_cluster_profile.azure-profile) == 1
22-
error_message = "No Azure cluster profile was created"
23-
}
21+
condition = length(spectrocloud_cluster_profile.azure-profile) == 1
22+
error_message = "No Azure cluster profile was created"
23+
}
2424

2525
assert {
26-
condition = length(spectrocloud_cluster_azure.azure-cluster) == 1
27-
error_message = "No Azure cluster was created"
28-
}
26+
condition = length(spectrocloud_cluster_azure.azure-cluster) == 1
27+
error_message = "No Azure cluster was created"
28+
}
2929

3030
assert {
31-
condition = length(tls_private_key.tutorial_ssh_key_azure) == 1
32-
error_message = "No Azure SSH key was created"
33-
}
31+
condition = length(tls_private_key.tutorial_ssh_key_azure) == 1
32+
error_message = "No Azure SSH key was created"
33+
}
3434

3535
}

0 commit comments

Comments
 (0)