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

feat: (IAC-1120) add and default to gp3 #186

Closed
wants to merge 1 commit into from
Closed

feat: (IAC-1120) add and default to gp3 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions docs/CONFIG-VARS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Custom policy:
| <div style="width:50px">Name</div> | <div style="width:150px">Description</div> | <div style="width:50px">Type</div> | <div style="width:75px">Default</div> | <div style="width:150px">Notes</div> |
| :--- | :--- | :--- | :--- | :--- |
| default_nodepool_vm_type | Type of the default node pool VMs | string | "m5.2xlarge" | |
| default_nodepool_os_disk_type | Disk type for default node pool VMs | string | gp2 | |
| default_nodepool_os_disk_type | Disk type for default node pool VMs | string | gp3 | |
| default_nodepool_os_disk_size | Disk size for default node pool VMs in GB | number | 200 ||
| default_nodepool_os_disk_iops | Disk IOPS for default node pool VMs | number | | For `io1`, you MUST set the value to your desired IOPS value. Refer to [Amazon EBS volume types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html) for details on values based on the `default_nodepool_os_disk_type` selected.|
| default_nodepool_node_count | Initial number of nodes in the default node pool | number | 1 | The value must be between `default_nodepool_min_nodes` and `default_nodepool_max_nodes`. |
Expand All @@ -235,7 +235,7 @@ Additional node pools can be created separately from the default node pool. This
| :--- | :--- | :--- | :--- | :--- |
| vm_type | Type of the node pool VMs | string | | https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html |
| cpu_type | Processor type CPU/GPU | string | AL2_x86_64| [AMI type](https://docs.aws.amazon.com/eks/latest/APIReference/API_Nodegroup.html#AmazonEKS-Type-Nodegroup-amiType) – Choose Amazon Linux 2 (AL2_x86_64) for Linux non-GPU instances, Amazon Linux 2 GPU Enabled (AL2_x86_64_GPU) for Linux GPU instances|
| os_disk_type | Disk type for node pool VMs | string | | `gp2` or `io1` |
| os_disk_type | Disk type for node pool VMs | string | | `gp3` or `io1` |
| os_disk_size | Disk size for node pool VMs in GB | number | | |
| os_disk_iops | Amount of provisioned [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html) | number | | For `io1`, you MUST set the value to your desired IOPS value. Reference [Amazon EBS volume types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html) for details on values based on the `os_disk_type` selected.|
| min_nodes | Minimum number of nodes in the node pool | number | | The value must be between `min_nodes` and `max_nodes`. |
Expand Down Expand Up @@ -263,7 +263,7 @@ When `storage_type=standard`, an NFS server VM is created, and the following var
| create_nfs_public_ip | Add public IP address to the NFS server VM | bool | false | |
| nfs_vm_admin | Admin user account for the NFS server VM | string | "nfsuser" | |
| nfs_raid_disk_size | Size in GiB for each EBS volume of the RAID0 cluster on the NFS server VM | number | 128 | |
| nfs_raid_disk_type | Disk type for the NFS server EBS volumes | string | "gp2" | Valid values are: "standard", "gp2", "io1", "io2", "sc1" or "st1". |
| nfs_raid_disk_type | Disk type for the NFS server EBS volumes | string | "gp3" | Valid values are: "standard", "gp3", "gp2", "io1", "io2", "sc1" or "st1". |
| nfs_raid_disk_iops | IOPS for the the NFS server EBS volumes | number | 0 | Only used when `nfs_raid_disk_type` is "io1" or "io2". |

### AWS Elastic File System (EFS)
Expand Down
2 changes: 1 addition & 1 deletion docs/sas-updates.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ If you are updating the SAS Viya platform to version 2021.2.6, take some additio
```
connect = {
"vm_type" = "m5.8xlarge"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 0
Expand Down
8 changes: 4 additions & 4 deletions examples/sample-input-byo.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ node_pools = {
cas = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -68,7 +68,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -86,7 +86,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -103,7 +103,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
10 changes: 5 additions & 5 deletions examples/sample-input-connect.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ node_pools = {
cas = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -58,7 +58,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -76,7 +76,7 @@ node_pools = {
connect = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -94,7 +94,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -111,7 +111,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
8 changes: 4 additions & 4 deletions examples/sample-input-custom-data.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ node_pools = {
cas = {
"vm_type" = "i3.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -58,7 +58,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -76,7 +76,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -93,7 +93,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
10 changes: 5 additions & 5 deletions examples/sample-input-gpu.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ node_pools = {
cas = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -58,7 +58,7 @@ node_pools = {
gpu_cas = {
"vm_type" = "p2.8xlarge"
"cpu_type" = "AL2_x86_64_GPU"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -75,7 +75,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -93,7 +93,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -110,7 +110,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
8 changes: 4 additions & 4 deletions examples/sample-input-ha.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ node_pools = {
cas = {
"vm_type" = "i3.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -61,7 +61,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -79,7 +79,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -96,7 +96,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
4 changes: 2 additions & 2 deletions examples/sample-input-minimal.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ node_pools = {
cas = {
"vm_type" = "r5.xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 0
Expand All @@ -59,7 +59,7 @@ node_pools = {
generic = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 0
Expand Down
8 changes: 4 additions & 4 deletions examples/sample-input.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ node_pools = {
cas = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -58,7 +58,7 @@ node_pools = {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -76,7 +76,7 @@ node_pools = {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -93,7 +93,7 @@ node_pools = {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down
2 changes: 1 addition & 1 deletion modules/aws_vm/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ variable "data_disk_size" {
}

variable "data_disk_type" {
default = "gp2"
default = "gp3"
}

variable "data_disk_availability_zone" {
Expand Down
16 changes: 8 additions & 8 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ variable "default_nodepool_vm_type" {

variable "default_nodepool_os_disk_type" {
type = string
default = "gp2"
default = "gp3"

validation {
condition = contains(["gp2", "io1"], lower(var.default_nodepool_os_disk_type))
error_message = "ERROR: Supported values for `default_nodepool_os_disk_type` are gp2, io1."
condition = contains(["gp3", "gp2", "io1"], lower(var.default_nodepool_os_disk_type))
error_message = "ERROR: Supported values for `default_nodepool_os_disk_type` are gp3, gp2, io1."
}
}

Expand Down Expand Up @@ -201,7 +201,7 @@ variable node_pools {
cas = {
"vm_type" = "m5.2xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -218,7 +218,7 @@ variable node_pools {
compute = {
"vm_type" = "m5.8xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -236,7 +236,7 @@ variable node_pools {
stateless = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand All @@ -253,7 +253,7 @@ variable node_pools {
stateful = {
"vm_type" = "m5.4xlarge"
"cpu_type" = "AL2_x86_64"
"os_disk_type" = "gp2"
"os_disk_type" = "gp3"
"os_disk_size" = 200
"os_disk_iops" = 0
"min_nodes" = 1
Expand Down Expand Up @@ -373,7 +373,7 @@ variable "nfs_raid_disk_size" {
}

variable "nfs_raid_disk_type" {
default = "gp2"
default = "gp3"
}

variable "nfs_raid_disk_iops" {
Expand Down