diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 1e542933..4f57a337 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -214,7 +214,7 @@ Custom policy: |
Name
|
Description
|
Type
|
Default
|
Notes
| | :--- | :--- | :--- | :--- | :--- | | 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`. | @@ -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`. | @@ -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) diff --git a/docs/sas-updates.md b/docs/sas-updates.md index 036ff3a9..2460fc4d 100644 --- a/docs/sas-updates.md +++ b/docs/sas-updates.md @@ -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 diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars index dc523de8..a9e7c0b4 100644 --- a/examples/sample-input-byo.tfvars +++ b/examples/sample-input-byo.tfvars @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars index ea9b7e76..8fdf50b9 100644 --- a/examples/sample-input-connect.tfvars +++ b/examples/sample-input-connect.tfvars @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/sample-input-custom-data.tfvars b/examples/sample-input-custom-data.tfvars index 3b03b855..0da95028 100644 --- a/examples/sample-input-custom-data.tfvars +++ b/examples/sample-input-custom-data.tfvars @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/sample-input-gpu.tfvars b/examples/sample-input-gpu.tfvars index 9668d9fb..4c67b409 100644 --- a/examples/sample-input-gpu.tfvars +++ b/examples/sample-input-gpu.tfvars @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars index 4b50514a..dec717e4 100644 --- a/examples/sample-input-ha.tfvars +++ b/examples/sample-input-ha.tfvars @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars index 4c5aebf4..ae8db380 100644 --- a/examples/sample-input-minimal.tfvars +++ b/examples/sample-input-minimal.tfvars @@ -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 @@ -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 diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars index e4e24a81..2fe81ac0 100644 --- a/examples/sample-input.tfvars +++ b/examples/sample-input.tfvars @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/modules/aws_vm/variables.tf b/modules/aws_vm/variables.tf index c7c8473f..e8376c9f 100644 --- a/modules/aws_vm/variables.tf +++ b/modules/aws_vm/variables.tf @@ -48,7 +48,7 @@ variable "data_disk_size" { } variable "data_disk_type" { - default = "gp2" + default = "gp3" } variable "data_disk_availability_zone" { diff --git a/variables.tf b/variables.tf index d4fde62c..eb7e346e 100644 --- a/variables.tf +++ b/variables.tf @@ -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." } } @@ -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 @@ -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 @@ -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 @@ -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 @@ -373,7 +373,7 @@ variable "nfs_raid_disk_size" { } variable "nfs_raid_disk_type" { - default = "gp2" + default = "gp3" } variable "nfs_raid_disk_iops" {