diff --git a/.gitleaksignore b/.gitleaksignore new file mode 100644 index 0000000..a8acd0b --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/packs/hello-universe-pack/values.yaml b/packs/hello-universe-pack/values.yaml index 910f707..2fb7408 100644 --- a/packs/hello-universe-pack/values.yaml +++ b/packs/hello-universe-pack/values.yaml @@ -10,4 +10,4 @@ manifests: hello-universe: registry: ghcr.io repository: spectrocloud/hello-universe - tag: 1.0.12 \ No newline at end of file + tag: 1.2.0 \ No newline at end of file diff --git a/terraform/cluster-profile-variables-tf/cluster_profiles.tf b/terraform/cluster-profile-variables-tf/cluster_profiles.tf index 82ac833..6eaeba3 100644 --- a/terraform/cluster-profile-variables-tf/cluster_profiles.tf +++ b/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 { diff --git a/terraform/cluster-profile-variables-tf/clusters.tf b/terraform/cluster-profile-variables-tf/clusters.tf index 7c42b5e..f867c91 100644 --- a/terraform/cluster-profile-variables-tf/clusters.tf +++ b/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"]) diff --git a/terraform/cluster-profile-variables-tf/inputs.tf b/terraform/cluster-profile-variables-tf/inputs.tf index 4ae145c..89dc782 100644 --- a/terraform/cluster-profile-variables-tf/inputs.tf +++ b/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" } } \ No newline at end of file diff --git a/terraform/cluster-profile-variables-tf/terraform.tfvars b/terraform/cluster-profile-variables-tf/terraform.tfvars index 59a3151..75326fa 100644 --- a/terraform/cluster-profile-variables-tf/terraform.tfvars +++ b/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,7 +83,7 @@ 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"]. } @@ -91,7 +91,7 @@ gcp_control_plane_nodes = { 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"]. } diff --git a/terraform/cluster-profile-variables-tf/tests/aws-replace.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/aws-replace.tftest.hcl index 507f012..aadedc5 100644 --- a/terraform/cluster-profile-variables-tf/tests/aws-replace.tftest.hcl +++ 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" diff --git a/terraform/cluster-profile-variables-tf/tests/aws.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/aws.tftest.hcl index 090f812..2e353dc 100644 --- a/terraform/cluster-profile-variables-tf/tests/aws.tftest.hcl +++ b/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" + } } diff --git a/terraform/cluster-profile-variables-tf/tests/azure-replace.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/azure-replace.tftest.hcl index 1835f7a..8a9f8c1 100644 --- a/terraform/cluster-profile-variables-tf/tests/azure-replace.tftest.hcl +++ b/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" diff --git a/terraform/cluster-profile-variables-tf/tests/azure.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/azure.tftest.hcl index 4d15530..55fed88 100644 --- a/terraform/cluster-profile-variables-tf/tests/azure.tftest.hcl +++ b/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" + } } diff --git a/terraform/cluster-profile-variables-tf/tests/gcp-replace.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/gcp-replace.tftest.hcl index bd18301..814e11e 100644 --- a/terraform/cluster-profile-variables-tf/tests/gcp-replace.tftest.hcl +++ b/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 diff --git a/terraform/cluster-profile-variables-tf/tests/gcp.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/gcp.tftest.hcl index 3d06eb8..85ac721 100644 --- a/terraform/cluster-profile-variables-tf/tests/gcp.tftest.hcl +++ b/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" + } } diff --git a/terraform/cluster-profile-variables-tf/tests/pack-and-profile.tftest.hcl b/terraform/cluster-profile-variables-tf/tests/pack-and-profile.tftest.hcl index b21e956..9bc253e 100644 --- a/terraform/cluster-profile-variables-tf/tests/pack-and-profile.tftest.hcl +++ b/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" diff --git a/terraform/getting-started-deployment-tf/clusters.tf b/terraform/getting-started-deployment-tf/clusters.tf index 5e172dc..91e7abe 100644 --- a/terraform/getting-started-deployment-tf/clusters.tf +++ b/terraform/getting-started-deployment-tf/clusters.tf @@ -39,8 +39,8 @@ resource "spectrocloud_cluster_aws" "aws-cluster" { } timeouts { - create = "30m" - delete = "15m" + create = "45m" + delete = "45m" } } ############### @@ -87,8 +87,8 @@ resource "spectrocloud_cluster_azure" "azure-cluster" { } timeouts { - create = "30m" - delete = "15m" + create = "45m" + delete = "45m" } } @@ -130,8 +130,8 @@ resource "spectrocloud_cluster_gcp" "gcp-cluster" { } timeouts { - create = "30m" - delete = "15m" + create = "45m" + delete = "45m" } } diff --git a/terraform/getting-started-deployment-tf/data.tf b/terraform/getting-started-deployment-tf/data.tf index 9443e2f..5f25d16 100644 --- a/terraform/getting-started-deployment-tf/data.tf +++ b/terraform/getting-started-deployment-tf/data.tf @@ -15,6 +15,7 @@ data "spectrocloud_registry" "community_registry" { ############# # AWS ############# + data "spectrocloud_cloudaccount_aws" "account" { count = var.deploy-aws ? 1 : 0 name = var.aws-cloud-account-name @@ -22,19 +23,19 @@ data "spectrocloud_cloudaccount_aws" "account" { data "spectrocloud_pack" "aws_csi" { name = "csi-aws-ebs" - version = "1.26.1" + version = "1.41.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_cni" { name = "cni-calico" - version = "3.27.0" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_k8s" { name = "kubernetes" - version = "1.29.0" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -54,19 +55,19 @@ data "spectrocloud_cloudaccount_azure" "account" { data "spectrocloud_pack" "azure_csi" { name = "csi-azure" - version = "1.28.3" + version = "1.32.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_cni" { name = "cni-calico-azure" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_k8s" { name = "kubernetes" - version = "1.30.4" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -75,7 +76,6 @@ data "spectrocloud_pack" "azure_ubuntu" { version = "22.04" registry_uid = data.spectrocloud_registry.public_registry.id } - ############# # GCP ############# @@ -86,19 +86,19 @@ data "spectrocloud_cloudaccount_gcp" "account" { data "spectrocloud_pack" "gcp_csi" { name = "csi-gcp-driver" - version = "1.12.4" + version = "1.15.4" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_cni" { name = "cni-calico" - version = "3.27.0" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_k8s" { name = "kubernetes" - version = "1.28.3" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -125,25 +125,25 @@ data "spectrocloud_pack" "vmware_ubuntu" { data "spectrocloud_pack" "vmware_k8s" { name = "kubernetes" - version = "1.28.13" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "vmware_cni" { name = "cni-calico" - version = "3.27.2" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "vmware_csi" { name = "csi-vsphere-csi" - version = "3.1.2" + version = "3.3.1" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "vmware_metallb" { name = "lb-metallb-helm" - version = "0.14.8" + version = "0.14.9" registry_uid = data.spectrocloud_registry.public_registry.id } diff --git a/terraform/getting-started-deployment-tf/terraform.tfvars b/terraform/getting-started-deployment-tf/terraform.tfvars index 83da6bd..de54713 100644 --- a/terraform/getting-started-deployment-tf/terraform.tfvars +++ b/terraform/getting-started-deployment-tf/terraform.tfvars @@ -6,7 +6,6 @@ ##################### palette-project = "Default" # The name of your project in Palette. - ############################## # Hello Universe Configuration ############################## @@ -16,7 +15,6 @@ replicas_number = 1 # The number of pods to be created. db_password = "REPLACE ME" # The database password to connect to the API database. auth_token = "REPLACE ME" # The auth token for the API connection. - ########################### # AWS Deployment Settings ############################ @@ -30,7 +28,7 @@ aws-key-pair-name = "REPLACE ME" aws_control_plane_nodes = { count = "1" control_plane = true - instance_type = "m4.xlarge" + instance_type = "m4.2xlarge" disk_size_gb = "60" availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-east-1a", "us-east-1b"]. } @@ -38,7 +36,7 @@ aws_control_plane_nodes = { aws_worker_nodes = { count = "1" control_plane = false - instance_type = "m4.xlarge" + instance_type = "m4.2xlarge" disk_size_gb = "60" availability_zones = ["REPLACE ME"] # If you want to deploy to multiple AZs, add them here. Example: ["us-east-1a", "us-east-1b"]. } @@ -59,7 +57,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 @@ -68,7 +66,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 @@ -87,7 +85,7 @@ gcp_project_name = "REPLACE ME" gcp_control_plane_nodes = { count = "1" control_plane = true - instance_type = "n1-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"]. } @@ -95,7 +93,7 @@ gcp_control_plane_nodes = { gcp_worker_nodes = { count = "1" control_plane = false - instance_type = "n1-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"]. } diff --git a/terraform/getting-started-deployment-tf/tests/aws-kubecost.tftest.hcl b/terraform/getting-started-deployment-tf/tests/aws-kubecost.tftest.hcl index 347de6b..bdfc69a 100644 --- a/terraform/getting-started-deployment-tf/tests/aws-kubecost.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/aws-kubecost.tftest.hcl @@ -3,10 +3,10 @@ # Test case 4 variables { - deploy-aws = true - deploy-aws-kubecost = true - db_password = "test_password" - auth_token = "test_token" + deploy-aws = true + deploy-aws-kubecost = true + db_password = "test_password" + auth_token = "test_token" aws-cloud-account-name = "test-account" aws-region = "test-region" aws-key-pair-name = "test-aws-key-pair" @@ -34,17 +34,17 @@ run "verify_aws_kubecost" { 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_profile.aws-profile-kubecost) == 1 - error_message = "No AWS cluster profile with Kubecost was created" - } + condition = length(spectrocloud_cluster_profile.aws-profile-kubecost) == 1 + error_message = "No AWS cluster profile with Kubecost 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" + } } \ No newline at end of file diff --git a/terraform/getting-started-deployment-tf/tests/aws-replace.tftest.hcl b/terraform/getting-started-deployment-tf/tests/aws-replace.tftest.hcl index 374b02c..8d118b0 100644 --- a/terraform/getting-started-deployment-tf/tests/aws-replace.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/aws-replace.tftest.hcl @@ -3,9 +3,9 @@ # Test case 5 variables { - deploy-aws = true - db_password = "test_password" - auth_token = "test_token" + deploy-aws = true + db_password = "test_password" + auth_token = "test_token" aws-cloud-account-name = "REPLACE ME" aws-region = "REPLACE ME" aws-key-pair-name = "REPLACE ME" diff --git a/terraform/getting-started-deployment-tf/tests/aws.tftest.hcl b/terraform/getting-started-deployment-tf/tests/aws.tftest.hcl index 69f86cf..afedad3 100644 --- a/terraform/getting-started-deployment-tf/tests/aws.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/aws.tftest.hcl @@ -3,9 +3,9 @@ # Test case 3 variables { - deploy-aws = true - db_password = "test_password" - auth_token = "test_token" + deploy-aws = true + db_password = "test_password" + auth_token = "test_token" aws-cloud-account-name = "test-account" aws-region = "test-region" aws-key-pair-name = "test-aws-key-pair" @@ -33,13 +33,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" + } } diff --git a/terraform/getting-started-deployment-tf/tests/azure-kubecost.tftest.hcl b/terraform/getting-started-deployment-tf/tests/azure-kubecost.tftest.hcl index b00825a..8eb8892 100644 --- a/terraform/getting-started-deployment-tf/tests/azure-kubecost.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/azure-kubecost.tftest.hcl @@ -3,10 +3,10 @@ # Test case 7 variables { - deploy-azure = true - deploy-azure-kubecost = true - db_password = "test_password" - auth_token = "test_token" + deploy-azure = true + deploy-azure-kubecost = true + db_password = "test_password" + auth_token = "test_token" azure-cloud-account-name = "test-account" azure-region = "test-region" azure_subscription_id = "test-azure-subscription-id" @@ -21,17 +21,17 @@ run "verify_azure_kubecost" { 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_profile.azure-profile-kubecost) == 1 - error_message = "No Azure cluster profile with Kubecost was created" - } + condition = length(spectrocloud_cluster_profile.azure-profile-kubecost) == 1 + error_message = "No Azure cluster profile with Kubecost 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" + } } \ No newline at end of file diff --git a/terraform/getting-started-deployment-tf/tests/azure-replace.tftest.hcl b/terraform/getting-started-deployment-tf/tests/azure-replace.tftest.hcl index 66fe232..85a1e5a 100644 --- a/terraform/getting-started-deployment-tf/tests/azure-replace.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/azure-replace.tftest.hcl @@ -3,9 +3,9 @@ # Test case 8 variables { - deploy-azure = true - db_password = "test_password" - auth_token = "test_token" + deploy-azure = true + db_password = "test_password" + auth_token = "test_token" azure-cloud-account-name = "REPLACE ME" azure-region = "REPLACE ME" azure_subscription_id = "REPLACE ME" diff --git a/terraform/getting-started-deployment-tf/tests/azure.tftest.hcl b/terraform/getting-started-deployment-tf/tests/azure.tftest.hcl index f84c3c9..96419b5 100644 --- a/terraform/getting-started-deployment-tf/tests/azure.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/azure.tftest.hcl @@ -3,9 +3,9 @@ # Test case 6 variables { - deploy-azure = true - db_password = "test_password" - auth_token = "test_token" + deploy-azure = true + db_password = "test_password" + auth_token = "test_token" azure-cloud-account-name = "test-account" azure-region = "test-region" azure_subscription_id = "test-azure-subscription-id" @@ -20,18 +20,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" + } } diff --git a/terraform/getting-started-deployment-tf/tests/gcp-kubecost.tftest.hcl b/terraform/getting-started-deployment-tf/tests/gcp-kubecost.tftest.hcl index f046a88..3188762 100644 --- a/terraform/getting-started-deployment-tf/tests/gcp-kubecost.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/gcp-kubecost.tftest.hcl @@ -3,13 +3,13 @@ # Test case 11 variables { - deploy-gcp = true - deploy-gcp-kubecost = true - db_password = "test_password" - auth_token = "test_token" + deploy-gcp = true + deploy-gcp-kubecost = true + db_password = "test_password" + auth_token = "test_token" 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 @@ -34,17 +34,17 @@ run "verify_gcp_kubecost" { 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_profile.gcp-profile-kubecost) == 1 - error_message = "No GCP cluster profile with Kubecost was created" - } + condition = length(spectrocloud_cluster_profile.gcp-profile-kubecost) == 1 + error_message = "No GCP cluster profile with Kubecost 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" + } } \ No newline at end of file diff --git a/terraform/getting-started-deployment-tf/tests/gcp-replace.tftest.hcl b/terraform/getting-started-deployment-tf/tests/gcp-replace.tftest.hcl index d6a7721..a5b8d18 100644 --- a/terraform/getting-started-deployment-tf/tests/gcp-replace.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/gcp-replace.tftest.hcl @@ -3,12 +3,12 @@ # Test case 12 variables { - deploy-gcp = true - db_password = "test_password" - auth_token = "test_token" + deploy-gcp = true + db_password = "test_password" + auth_token = "test_token" 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 diff --git a/terraform/getting-started-deployment-tf/tests/gcp.tftest.hcl b/terraform/getting-started-deployment-tf/tests/gcp.tftest.hcl index 660b80a..0aefdaf 100644 --- a/terraform/getting-started-deployment-tf/tests/gcp.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/gcp.tftest.hcl @@ -3,12 +3,12 @@ # Test case 10 variables { - deploy-gcp = true - db_password = "test_password" - auth_token = "test_token" + deploy-gcp = true + db_password = "test_password" + auth_token = "test_token" 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 @@ -33,13 +33,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" + } } diff --git a/terraform/getting-started-deployment-tf/tests/pack-hello-uni.tftest.hcl b/terraform/getting-started-deployment-tf/tests/pack-hello-uni.tftest.hcl index 7197a36..7214543 100644 --- a/terraform/getting-started-deployment-tf/tests/pack-hello-uni.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/pack-hello-uni.tftest.hcl @@ -3,9 +3,9 @@ # Test case 2 variables { - deploy-aws = true - db_password = "REPLACE ME" - auth_token = "REPLACE ME" + deploy-aws = true + db_password = "REPLACE ME" + auth_token = "REPLACE ME" aws-cloud-account-name = "test-account" aws-region = "test-region" aws-key-pair-name = "test-aws-key-pair" diff --git a/terraform/getting-started-deployment-tf/tests/vmware-ip-pool.tftest.hcl b/terraform/getting-started-deployment-tf/tests/vmware-ip-pool.tftest.hcl index 0bbbaf2..6c35fce 100644 --- a/terraform/getting-started-deployment-tf/tests/vmware-ip-pool.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/vmware-ip-pool.tftest.hcl @@ -3,19 +3,19 @@ # Test case 17 variables { - deploy-vmware = true + deploy-vmware = true deploy-vmware-static = true - db_password = "test_password" - auth_token = "test_token" - metallb_ip = "test_ip" - pcg_name = "test_pcg" - datacenter_name = "test_datacenter" - folder_name = "test_folder" - search_domain = "test_search_domain" - vsphere_cluster = "test_cluster" - datastore_name = "test_datastore" - network_name = "test_network" - resource_pool_name = "test_resource_pool" + db_password = "test_password" + auth_token = "test_token" + metallb_ip = "test_ip" + pcg_name = "test_pcg" + datacenter_name = "test_datacenter" + folder_name = "test_folder" + search_domain = "test_search_domain" + vsphere_cluster = "test_cluster" + datastore_name = "test_datastore" + network_name = "test_network" + resource_pool_name = "test_resource_pool" } mock_provider "spectrocloud" {} @@ -25,7 +25,7 @@ run "verify_vmware" { command = plan assert { - condition = length(spectrocloud_privatecloudgateway_ippool.ippool) == 1 - error_message = "No VMware IP pool was created" - } + condition = length(spectrocloud_privatecloudgateway_ippool.ippool) == 1 + error_message = "No VMware IP pool was created" + } } diff --git a/terraform/getting-started-deployment-tf/tests/vmware-kubecost.tftest.hcl b/terraform/getting-started-deployment-tf/tests/vmware-kubecost.tftest.hcl index 635f8ef..63df57c 100644 --- a/terraform/getting-started-deployment-tf/tests/vmware-kubecost.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/vmware-kubecost.tftest.hcl @@ -3,19 +3,19 @@ # Test case 14 variables { - deploy-vmware = true + deploy-vmware = true deploy-vmware-kubecost = true - db_password = "test_password" - auth_token = "test_token" - metallb_ip = "test_ip" - pcg_name = "test_pcg" - datacenter_name = "test_datacenter" - folder_name = "test_folder" - search_domain = "test_search_domain" - vsphere_cluster = "test_cluster" - datastore_name = "test_datastore" - network_name = "test_network" - resource_pool_name = "test_resource_pool" + db_password = "test_password" + auth_token = "test_token" + metallb_ip = "test_ip" + pcg_name = "test_pcg" + datacenter_name = "test_datacenter" + folder_name = "test_folder" + search_domain = "test_search_domain" + vsphere_cluster = "test_cluster" + datastore_name = "test_datastore" + network_name = "test_network" + resource_pool_name = "test_resource_pool" } mock_provider "spectrocloud" { @@ -26,17 +26,17 @@ run "verify_vmware_kubecost" { command = plan assert { - condition = length(spectrocloud_cluster_profile.vmware-profile) == 1 - error_message = "No VMware cluster profile was created" - } + condition = length(spectrocloud_cluster_profile.vmware-profile) == 1 + error_message = "No VMware cluster profile was created" + } assert { - condition = length(spectrocloud_cluster_profile.vmware-profile-kubecost) == 1 - error_message = "No VMware cluster profile with Kubecost was created" - } + condition = length(spectrocloud_cluster_profile.vmware-profile-kubecost) == 1 + error_message = "No VMware cluster profile with Kubecost was created" + } assert { - condition = length(spectrocloud_cluster_vsphere.vmware-cluster) == 1 - error_message = "No VMware cluster was created" - } + condition = length(spectrocloud_cluster_vsphere.vmware-cluster) == 1 + error_message = "No VMware cluster was created" + } } \ No newline at end of file diff --git a/terraform/getting-started-deployment-tf/tests/vmware-replace.tftest.hcl b/terraform/getting-started-deployment-tf/tests/vmware-replace.tftest.hcl index a115c5e..25e3d11 100644 --- a/terraform/getting-started-deployment-tf/tests/vmware-replace.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/vmware-replace.tftest.hcl @@ -3,17 +3,17 @@ # Test case 15 variables { - deploy-vmware = true - db_password = "test_password" - auth_token = "test_token" - metallb_ip = "REPLACE ME" - pcg_name = "REPLACE ME" - datacenter_name = "REPLACE ME" - folder_name = "REPLACE ME" - search_domain = "REPLACE ME" - vsphere_cluster = "REPLACE ME" + deploy-vmware = true + db_password = "test_password" + auth_token = "test_token" + metallb_ip = "REPLACE ME" + pcg_name = "REPLACE ME" + datacenter_name = "REPLACE ME" + folder_name = "REPLACE ME" + search_domain = "REPLACE ME" + vsphere_cluster = "REPLACE ME" datastore_name = "REPLACE ME" - network_name = "REPLACE ME" + network_name = "REPLACE ME" resource_pool_name = "REPLACE ME" } diff --git a/terraform/getting-started-deployment-tf/tests/vmware-ssh.tftest.hcl b/terraform/getting-started-deployment-tf/tests/vmware-ssh.tftest.hcl index 9d83ceb..44497ad 100644 --- a/terraform/getting-started-deployment-tf/tests/vmware-ssh.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/vmware-ssh.tftest.hcl @@ -3,20 +3,20 @@ # Test case 16 variables { - deploy-vmware = true - db_password = "test_password" - auth_token = "test_token" - metallb_ip = "test_ip" - pcg_name = "test_pcg" - datacenter_name = "test_datacenter" - folder_name = "test_folder" - search_domain = "test_search_domain" - vsphere_cluster = "test_cluster" + deploy-vmware = true + db_password = "test_password" + auth_token = "test_token" + metallb_ip = "test_ip" + pcg_name = "test_pcg" + datacenter_name = "test_datacenter" + folder_name = "test_folder" + search_domain = "test_search_domain" + vsphere_cluster = "test_cluster" datastore_name = "test_datastore" - network_name = "test_network" + network_name = "test_network" resource_pool_name = "test_resource_pool" - ssh_key = "" - ssh_key_private = "" + ssh_key = "" + ssh_key_private = "" } mock_provider "spectrocloud" { @@ -27,18 +27,18 @@ run "verify_vmware" { command = plan assert { - condition = length(tls_private_key.tutorial_ssh_key) == 1 - error_message = "No SSH key was created" - } + condition = length(tls_private_key.tutorial_ssh_key) == 1 + error_message = "No SSH key was created" + } assert { - condition = length(local_sensitive_file.private_key_file) == 1 - error_message = "The file to store the private key was not created" - } + condition = length(local_sensitive_file.private_key_file) == 1 + error_message = "The file to store the private key was not created" + } assert { - condition = length(local_file.public_key_file) == 1 - error_message = "The file to store the public key was not created" - } + condition = length(local_file.public_key_file) == 1 + error_message = "The file to store the public key was not created" + } } diff --git a/terraform/getting-started-deployment-tf/tests/vmware.tftest.hcl b/terraform/getting-started-deployment-tf/tests/vmware.tftest.hcl index 06bbf20..0e86c48 100644 --- a/terraform/getting-started-deployment-tf/tests/vmware.tftest.hcl +++ b/terraform/getting-started-deployment-tf/tests/vmware.tftest.hcl @@ -3,17 +3,17 @@ # Test case 13 variables { - deploy-vmware = true - db_password = "test_password" - auth_token = "test_token" - metallb_ip = "test_ip" - pcg_name = "test_pcg" - datacenter_name = "test_datacenter" - folder_name = "test_folder" - search_domain = "test_search_domain" - vsphere_cluster = "test_cluster" + deploy-vmware = true + db_password = "test_password" + auth_token = "test_token" + metallb_ip = "test_ip" + pcg_name = "test_pcg" + datacenter_name = "test_datacenter" + folder_name = "test_folder" + search_domain = "test_search_domain" + vsphere_cluster = "test_cluster" datastore_name = "test_datastore" - network_name = "test_network" + network_name = "test_network" resource_pool_name = "test_resource_pool" } @@ -25,13 +25,13 @@ run "verify_vmware" { command = plan assert { - condition = length(spectrocloud_cluster_profile.vmware-profile) == 1 - error_message = "No VMware cluster profile was created" - } + condition = length(spectrocloud_cluster_profile.vmware-profile) == 1 + error_message = "No VMware cluster profile was created" + } assert { - condition = length(spectrocloud_cluster_vsphere.vmware-cluster) == 1 - error_message = "No VMware cluster was created" - } + condition = length(spectrocloud_cluster_vsphere.vmware-cluster) == 1 + error_message = "No VMware cluster was created" + } } diff --git a/terraform/iaas-cluster-deployment-tf/data.tf b/terraform/iaas-cluster-deployment-tf/data.tf index 19dc901..650c549 100644 --- a/terraform/iaas-cluster-deployment-tf/data.tf +++ b/terraform/iaas-cluster-deployment-tf/data.tf @@ -18,19 +18,19 @@ data "spectrocloud_cloudaccount_aws" "account" { data "spectrocloud_pack" "aws_csi" { name = "csi-aws-ebs" - version = "1.22.0" + version = "1.41.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_cni" { name = "cni-calico" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -50,19 +50,19 @@ data "spectrocloud_cloudaccount_azure" "account" { data "spectrocloud_pack" "azure_csi" { name = "csi-azure" - version = "1.28.3" + version = "1.32.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_cni" { name = "cni-calico-azure" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -82,19 +82,19 @@ data "spectrocloud_cloudaccount_gcp" "account" { data "spectrocloud_pack" "gcp_csi" { name = "csi-gcp-driver" - version = "1.8.2" + version = "1.15.4" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_cni" { name = "cni-calico" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } diff --git a/terraform/iaas-cluster-deployment-tf/terraform.tfvars b/terraform/iaas-cluster-deployment-tf/terraform.tfvars index ac7fd6c..25405dc 100644 --- a/terraform/iaas-cluster-deployment-tf/terraform.tfvars +++ b/terraform/iaas-cluster-deployment-tf/terraform.tfvars @@ -41,7 +41,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 @@ -50,7 +50,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 @@ -68,7 +68,7 @@ gcp_project_name = "REPLACE_ME" gcp_control_plane_nodes = { count = "1" control_plane = true - instance_type = "n1-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"] } @@ -76,7 +76,7 @@ gcp_control_plane_nodes = { gcp_worker_nodes = { count = "1" control_plane = false - instance_type = "n1-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"] } \ No newline at end of file diff --git a/terraform/iaas-cluster-update-tf/data.tf b/terraform/iaas-cluster-update-tf/data.tf index 8cb5683..f42f02d 100644 --- a/terraform/iaas-cluster-update-tf/data.tf +++ b/terraform/iaas-cluster-update-tf/data.tf @@ -18,19 +18,19 @@ data "spectrocloud_cloudaccount_aws" "account" { data "spectrocloud_pack" "aws_csi" { name = "csi-aws-ebs" - version = "1.22.0" + version = "1.41.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_cni" { name = "cni-calico" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "aws_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -59,19 +59,19 @@ data "spectrocloud_cloudaccount_azure" "account" { data "spectrocloud_pack" "azure_csi" { name = "csi-azure" - version = "1.28.3" + version = "1.32.0" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_cni" { name = "cni-calico-azure" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "azure_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -100,19 +100,19 @@ data "spectrocloud_cloudaccount_gcp" "account" { data "spectrocloud_pack" "gcp_csi" { name = "csi-gcp-driver" - version = "1.8.2" + version = "1.15.4" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_cni" { name = "cni-calico" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "gcp_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } diff --git a/terraform/iaas-cluster-update-tf/terraform.tfvars b/terraform/iaas-cluster-update-tf/terraform.tfvars index e2a93e2..8ae7664 100644 --- a/terraform/iaas-cluster-update-tf/terraform.tfvars +++ b/terraform/iaas-cluster-update-tf/terraform.tfvars @@ -44,7 +44,7 @@ azure-hello-universe-api-uri = "http://REPLACE_ME:3000" # Set IP address of hell 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 @@ -53,7 +53,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 @@ -73,7 +73,7 @@ gcp-hello-universe-api-uri = "http://REPLACE_ME:3000" # Set IP address of hello- gcp_control_plane_nodes = { count = "1" control_plane = true - instance_type = "n1-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"] } @@ -81,7 +81,7 @@ gcp_control_plane_nodes = { gcp_worker_nodes = { count = "1" control_plane = false - instance_type = "n1-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"] } diff --git a/terraform/pack-tf/data.tf b/terraform/pack-tf/data.tf index e533040..ca0503c 100644 --- a/terraform/pack-tf/data.tf +++ b/terraform/pack-tf/data.tf @@ -22,19 +22,19 @@ data "spectrocloud_pack" "ubuntu" { data "spectrocloud_pack" "k8s" { name = "kubernetes" - version = "1.28.2" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "cni" { name = "cni-calico" - version = "3.26.1" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "csi" { name = "csi-aws-ebs" - version = "1.22.0" + version = "1.41.0" registry_uid = data.spectrocloud_registry.public_registry.id } diff --git a/terraform/pack-tf/profile.tf b/terraform/pack-tf/profile.tf index c1bd47c..19be2fd 100644 --- a/terraform/pack-tf/profile.tf +++ b/terraform/pack-tf/profile.tf @@ -15,28 +15,28 @@ resource "spectrocloud_cluster_profile" "profile" { # Packs below have a static name and tag value. Refer to the HubbleAPI collection before changing these value. pack { name = "ubuntu-aws" - tag = "LTS__22.4.x" + tag = "22.04" uid = data.spectrocloud_pack.ubuntu.id values = data.spectrocloud_pack.ubuntu.values } pack { name = "kubernetes" - tag = "1.28.x" + tag = "1.32.3" uid = data.spectrocloud_pack.k8s.id values = data.spectrocloud_pack.k8s.values } pack { name = "cni-calico" - tag = "3.26.x" + tag = "3.29.3" uid = data.spectrocloud_pack.cni.id values = data.spectrocloud_pack.cni.values } pack { name = "csi-aws-ebs" - tag = "1.22.x" + tag = "1.41.0" uid = data.spectrocloud_pack.csi.id values = data.spectrocloud_pack.csi.values } @@ -48,7 +48,7 @@ resource "spectrocloud_cluster_profile" "profile" { # Custom add-on pack pack { name = "hellouniverse" - tag = "1.0.x" + tag = "1.2.0" uid = data.spectrocloud_pack.hellouniverse.id values = data.spectrocloud_pack.hellouniverse.values } diff --git a/terraform/pack-tf/provider.tf b/terraform/pack-tf/provider.tf index 42db824..757bc3a 100644 --- a/terraform/pack-tf/provider.tf +++ b/terraform/pack-tf/provider.tf @@ -7,7 +7,7 @@ terraform { version = ">= 0.16.1" source = "spectrocloud/spectrocloud" } - aws = { + aws = { source = "hashicorp/aws" version = "~> 5.0" } diff --git a/terraform/pack-tf/terraform.tfvars b/terraform/pack-tf/terraform.tfvars index 8f0ad60..9ef7bef 100644 --- a/terraform/pack-tf/terraform.tfvars +++ b/terraform/pack-tf/terraform.tfvars @@ -1,9 +1,9 @@ # Copyright (c) Spectro Cloud # SPDX-License-Identifier: Apache-2.0 -cluster_cloud_account_aws_name = "REPLACE ME" # Name of the cloud account added to your Palette project settings -aws_region_name = "REPLACE ME" # Use "us-east-1" or any other AWS region -aws_az_names = [] # Specify the AWS availability zone name in which you want the cluster to be available. By default, only one AZ will be selected. For example: ['us-east-1a', 'us-east-1b', 'us-east-1c']. -ssh_key_name = "REPLACE ME" # Name of the SSH key available in the region where you will deploy the cluster -private_pack_registry = "REPLACE ME" # Your registry server name. This tutorial uses "private-pack-registry". -use_oci_registry = true # Set the use of OCI registry to true or false. The default value is set as true. \ No newline at end of file +cluster_cloud_account_aws_name = "REPLACE ME" # Name of the cloud account added to your Palette project settings +aws_region_name = "REPLACE ME" # Use "us-east-1" or any other AWS region +aws_az_names = [] # Specify the AWS availability zone name in which you want the cluster to be available. By default, only one AZ will be selected. For example: ['us-east-1a', 'us-east-1b', 'us-east-1c']. +ssh_key_name = "REPLACE ME" # Name of the SSH key available in the region where you will deploy the cluster +private_pack_registry = "REPLACE ME" # Your registry server name. This tutorial uses "private-pack-registry". +use_oci_registry = true # Set the use of OCI registry to true or false. The default value is set as true. \ No newline at end of file diff --git a/terraform/vmware-cluster-deployment-tf/data.tf b/terraform/vmware-cluster-deployment-tf/data.tf index 20ed4ac..041059a 100644 --- a/terraform/vmware-cluster-deployment-tf/data.tf +++ b/terraform/vmware-cluster-deployment-tf/data.tf @@ -25,25 +25,25 @@ data "spectrocloud_pack" "ubuntu" { data "spectrocloud_pack" "k8s" { name = "kubernetes" - version = "1.28.3" + version = "1.32.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "cni" { name = "cni-calico" - version = "3.26.3" + version = "3.29.3" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "csi" { name = "csi-vsphere-csi" - version = "3.0.2" + version = "3.3.1" registry_uid = data.spectrocloud_registry.public_registry.id } data "spectrocloud_pack" "metallb" { name = "lb-metallb-helm" - version = "0.13.11" + version = "0.14.9" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -53,7 +53,7 @@ data "spectrocloud_pack" "metallb" { data "spectrocloud_pack" "hellouniverse" { name = "hello-universe" - version = "1.1.1" + version = "1.2.0" registry_uid = data.spectrocloud_registry.community_registry.id }