Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use smaller instances for AWS E2E tests #2415

Merged
merged 3 commits into from
Oct 24, 2022
Merged

Use smaller instances for AWS E2E tests #2415

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
870cc47
Make worker volume size configurable in AWS configs
xmudrii Oct 21, 2022
14c0fd2
Use smaller instances for AWS E2E tests
xmudrii Oct 21, 2022
ee48d5d
Use varFile for AWS infra definitions
xmudrii Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/terraform/aws/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ No modules.
| <a name="input_worker_deploy_ssh_key"></a> [worker\_deploy\_ssh\_key](#input\_worker\_deploy\_ssh\_key) | add provided ssh public key to MachineDeployments | `bool` | `true` | no |
| <a name="input_worker_os"></a> [worker\_os](#input\_worker\_os) | OS to run on worker machines, default to var.os | `string` | `""` | no |
| <a name="input_worker_type"></a> [worker\_type](#input\_worker\_type) | instance type for workers | `string` | `"t3.medium"` | no |
| <a name="input_worker_volume_size"></a> [worker\_volume\_size](#input\_worker\_volume\_size) | Size of the EBS volume, in Gb | `number` | `50` | no |

## Outputs

Expand Down
6 changes: 3 additions & 3 deletions examples/terraform/aws/output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ output "kubeone_workers" {
subnetId = local.subnets[local.zoneA]
instanceType = var.worker_type
assignPublicIP = true
diskSize = 50
diskSize = var.worker_volume_size
diskType = "gp2"
## Only applicable if diskType = io1
diskIops = 500
Expand Down Expand Up @@ -183,7 +183,7 @@ output "kubeone_workers" {
subnetId = local.subnets[local.zoneB]
instanceType = var.worker_type
assignPublicIP = true
diskSize = 50
diskSize = var.worker_volume_size
diskType = "gp2"
## Only applicable if diskType = io1
diskIops = 500
Expand Down Expand Up @@ -241,7 +241,7 @@ output "kubeone_workers" {
subnetId = local.subnets[local.zoneC]
instanceType = var.worker_type
assignPublicIP = true
diskSize = 50
diskSize = var.worker_volume_size
diskType = "gp2"
## Only applicable if diskType = io1
diskIops = 500
Expand Down
6 changes: 6 additions & 0 deletions examples/terraform/aws/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@ variable "worker_type" {
type = string
}

variable "worker_volume_size" {
default = 50
description = "Size of the EBS volume, in Gb"
type = number
}

variable "bastion_type" {
default = "t3.nano"
description = "instance type for bastion"
Expand Down
104 changes: 104 additions & 0 deletions test/e2e/tests_definitions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ var (
vars: []string{
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
// Use smaller instances in Ireland (the cheapest EU region)
xmudrii marked this conversation as resolved.
Show resolved Hide resolved
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -58,6 +66,13 @@ var (
vars: []string{
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -76,6 +91,14 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=centos",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -94,6 +117,13 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=centos",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -113,6 +143,14 @@ var (
"subnets_cidr=27",
"os=rhel",
"bastion_type=t3.micro",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=50",
"worker_type=t3a.small",
"worker_volume_size=50",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -132,6 +170,12 @@ var (
"subnets_cidr=27",
"os=rhel",
"bastion_type=t3.micro",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=50",
"worker_type=t3a.micro",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -150,6 +194,14 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=rockylinux",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -168,6 +220,13 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=rockylinux",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -186,6 +245,14 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=flatcar",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -204,6 +271,13 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=flatcar",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -225,6 +299,14 @@ var (
"ssh_username=core",
"bastion_user=core",
"worker_deploy_ssh_key=false",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -246,6 +328,13 @@ var (
"ssh_username=core",
"bastion_user=core",
"worker_deploy_ssh_key=false",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -264,6 +353,14 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=amzn",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.small",
"worker_volume_size=25",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand All @@ -282,6 +379,13 @@ var (
"disable_kubeapi_loadbalancer=true",
"subnets_cidr=27",
"os=amzn",
// Use smaller instances in Ireland (the cheapest EU region)
"aws_region=eu-west-1",
"control_plane_type=t3a.small",
"control_plane_volume_size=25",
"worker_type=t3a.micro",
"bastion_type=t3a.nano",
"initial_machinedeployment_spotinstances_max_price=0.0204",
},
},
},
Expand Down