Skip to content

Commit

Permalink
Merge branch 'master' into refactor-negative-variable-list
Browse files Browse the repository at this point in the history
  • Loading branch information
@yangchiu
yangchiu authored Mar 8, 2024
2 parents 74d1360 + 8a208cc commit 3b6dbf2
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion build_engine_test_images/terraform/aws/ubuntu/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ variable "build_engine_aws_instance_name" {

variable "build_engine_aws_instance_type" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = ""
}

Expand Down
2 changes: 1 addition & 1 deletion pipelines/storage_network/terraform/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ variable "aws_instance_count" {

variable "aws_instance_type" {
type = string
description = "Recommended instance types t2.xlarge for amd64 & a1.xlarge for arm64"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

Expand Down
4 changes: 2 additions & 2 deletions scalability_test/terraform/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
default = "t3.xlarge"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
default = "t3.xlarge"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
4 changes: 2 additions & 2 deletions test_framework/terraform/aws/centos/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
2 changes: 1 addition & 1 deletion test_framework/terraform/aws/eks/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ resource "aws_eks_node_group" "node_group" {
subnet_ids = module.vpc.public_subnets
ami_type = var.arch == "amd64" ? "AL2_x86_64" : "AL2_ARM_64"
capacity_type = "ON_DEMAND"
instance_types = [var.arch == "amd64" ? "t3.xlarge" : "t4g.xlarge"]
instance_types = [var.arch == "amd64" ? "t2.xlarge" : "a1.2xlarge"]
disk_size = 40
scaling_config {
desired_size = 3
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/oracle/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/rhel/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/rockylinux/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/sle-micro/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/sles/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down
8 changes: 4 additions & 4 deletions test_framework/terraform/aws/ubuntu/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" {

variable "lh_aws_instance_type_controlplane" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_type_worker" {
type = string
description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64"
default = "t3.xlarge"
description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64"
default = "t2.xlarge"
}

variable "lh_aws_instance_root_block_device_size_controlplane" {
Expand Down

0 comments on commit 3b6dbf2

Please sign in to comment.