From c5076047dfd686a3049d1cbd0cadbf0fd157f2a6 Mon Sep 17 00:00:00 2001 From: jarpat Date: Mon, 3 Jun 2024 10:44:11 -0400 Subject: [PATCH 01/11] default updates, docs, variables.tf, and single example - WIP --- docs/CONFIG-VARS.md | 12 ++--- docs/REQUIREMENTS.md | 4 +- examples/vsphere/sample-terraform-dhcp.tfvars | 50 +++++++------------ variables.tf | 8 +-- 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 8aaecad..2d4ebfd 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -257,8 +257,8 @@ jump_ip = "" # Assigned values for static IP addresses | :--- | :--- | :--- | :--- | :--- | | create_nfs | Creation flag | bool | false | | | nfs_num_cpu | # of CPUs | number | 4 | | -| nfs_memory | Memory in MB | number | 8092 | | -| nfs_disk_size | Size of disk in GB | number | 250 | | +| nfs_memory | Memory in MB | number | 16384 | | +| nfs_disk_size | Size of disk in GB | number | 400 | | | nfs_ip | Static IP for NFS server | string | | | Sample: @@ -293,9 +293,9 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para | Name | Description | Type | Default | Notes | | :--- | :--- | :--- | :--- | :--- | -| server_num_cpu | # of CPUs | number | 8 | | +| server_num_cpu | # of CPUs | number | 4 | | | server_memory | Memory in MB | number | 16385 | | -| server_disk_size | Size of disk in GB | number | 250 | | +| server_disk_size | Size of disk in GB | number | 128 | | | server_ip | Static IP address for PostgreSQL server | string | | This is a required field. | | server_version | The version of the PostgreSQL server | string | "15" | Refer to the [SAS Viya platform System Requirements](https://documentation.sas.com/?cdcId=sasadmincdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for the SAS Viya platform. | | server_ssl | Enable/disable SSL | string | "off" | | @@ -322,9 +322,9 @@ postgres_servers = { server_ip = "10.10.10.10" # Assigned values for static IPs }, cds-postgres = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 8 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 256 GB server_ip = "10.10.10.11" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "on" # SSL flag diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index cc8e6bb..5520352 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -46,8 +46,8 @@ The following table lists the minimum machine requirements that are needed to su | **Control Plane** | 2 | 4 GB | 100 GB | You must have an odd number of nodes, 3 or more, in order to provide high availability (HA) for the cluster. | 1 | | **Nodes** | xx | xx GB | xx GB | Nodes in the Kubernetes cluster. The number of machines varies, depending on multiple factors. Suggested capacities and information can be found in the sample files. | 3 | | **Jump Server** | 4 | 8 GB | 100 GB | Bastion box that is used to access NFS mounts, share data, etc. | 1 | -| **NFS Server** | 8 | 16 GB | 500 GB | Required server that is used to store persistent volumes for the cluster. Used for providing storage for the `default` storage class in the cluster. | 1 | -| **PostgreSQL Servers** | 8 | 16 GB | 250 GB | PostgreSQL servers for your SAS Viya platform deployment. | 1..n | +| **NFS Server** | 4 | 16 GB | 400 GB | Required server that is used to store persistent volumes for the cluster. Used for providing storage for the `default` storage class in the cluster. | 1 | +| **PostgreSQL Servers** | 4 | 16 GB | 128 GB | PostgreSQL servers for your SAS Viya platform deployment. | 1..n | ### VMware vSphere or vCenter diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index fc6080e..87fcb06 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -99,7 +99,7 @@ node_pools = { system = { count = 1 cpus = 8 - memory = 16384 + memory = 65536 os_disk = 100 node_taints = [] node_labels = { @@ -107,13 +107,12 @@ node_pools = { } }, cas = { - count = 3 + count = 1 cpus = 16 memory = 131072 os_disk = 350 misc_disks = [ - 150, - 150, + 400, ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { @@ -122,9 +121,12 @@ node_pools = { }, compute = { count = 1 - cpus = 16 - memory = 131072 + cpus = 4 + memory = 16384 os_disk = 100 + misc_disks = [ + 400, + ] node_taints = ["workload.sas.com/class=compute:NoSchedule"] node_labels = { "workload.sas.com/class" = "compute" @@ -132,9 +134,9 @@ node_pools = { } }, stateful = { - count = 1 - cpus = 8 - memory = 32768 + count = 2 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, @@ -145,9 +147,9 @@ node_pools = { } }, stateless = { - count = 2 - cpus = 8 - memory = 32768 + count = 4 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, @@ -156,22 +158,6 @@ node_pools = { node_labels = { "workload.sas.com/class" = "stateless" } - }, - singlestore = { - count = 3 - cpus = 16 - memory = 131072 - os_disk = 100 - misc_disks = [ - 150, - 150, - 250, - 250, - ] - node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] - node_labels = { - "workload.sas.com/class" = "singlestore" - } } } @@ -184,17 +170,17 @@ jump_ip = "" # Assigned values for static IPs # NFS server create_nfs = true # Creation flag -nfs_num_cpu = 8 # 8 CPUs +nfs_num_cpu = 4 # 4 CPUs nfs_memory = 16384 # 16 GB -nfs_disk_size = 500 # 500 GB +nfs_disk_size = 400 # 400 GB nfs_ip = "" # Assigned values for static IPs # Postgres Servers postgres_servers = { default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 128 GB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag diff --git a/variables.tf b/variables.tf index 825c540..0fb86e5 100644 --- a/variables.tf +++ b/variables.tf @@ -199,7 +199,7 @@ variable "nfs_ip" { variable "nfs_memory" { type = number - default = 8092 + default = 16384 } variable "nfs_num_cpu" { @@ -209,7 +209,7 @@ variable "nfs_num_cpu" { variable "nfs_disk_size" { type = number - default = 250 + default = 400 } # container registry - TODO @@ -242,9 +242,9 @@ variable "postgres_server_defaults" { description = "" type = any default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GiB - server_disk_size = 250 # 250 GiB + server_disk_size = 128 # 128 GiB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag From 5399d6643d953ddeced7b06fcafd80bee02d6d64 Mon Sep 17 00:00:00 2001 From: jarpat Date: Tue, 4 Jun 2024 13:06:57 -0400 Subject: [PATCH 02/11] update sample-terraform-static-ips.tfvars --- .../sample-terraform-static-ips.tfvars | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index 1fa50ce..e98af0e 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -102,7 +102,7 @@ node_pools = { # Other variables may be altered system = { cpus = 8 - memory = 16384 + memory = 65536 os_disk = 100 ip_addresses = [ "", @@ -117,13 +117,10 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 150, - 150, + 400, ] ip_addresses = [ "", - "", - "", ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { @@ -131,9 +128,12 @@ node_pools = { } }, compute = { - cpus = 16 - memory = 131072 + cpus = 4 + memory = 16384 os_disk = 100 + misc_disks = [ + 400, + ] ip_addresses = [ "", ] @@ -144,14 +144,15 @@ node_pools = { } }, stateful = { - cpus = 8 - memory = 32768 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, ] ip_addresses = [ "", + "", ] node_taints = ["workload.sas.com/class=stateful:NoSchedule"] node_labels = { @@ -159,8 +160,8 @@ node_pools = { } }, stateless = { - cpus = 8 - memory = 32768 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, @@ -168,6 +169,8 @@ node_pools = { ip_addresses = [ "", "", + "", + "", ] node_taints = ["workload.sas.com/class=stateless:NoSchedule"] node_labels = { @@ -185,17 +188,17 @@ jump_ip = "" # Assigned values for static IPs # NFS server create_nfs = true # Creation flag -nfs_num_cpu = 8 # 8 CPUs +nfs_num_cpu = 4 # 4 CPUs nfs_memory = 16384 # 16 GB -nfs_disk_size = 500 # 500 GB +nfs_disk_size = 400 # 400 GB nfs_ip = "" # Assigned values for static IPs # Postgres Servers postgres_servers = { default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 128 GB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag From cd035c46a8a4c407265017886a421f58f2f8a483 Mon Sep 17 00:00:00 2001 From: jarpat Date: Tue, 4 Jun 2024 15:55:33 -0400 Subject: [PATCH 03/11] sample-terraform-static-singlestore.tfvars --- ...sample-terraform-static-singlestore.tfvars | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index 429e824..b319da0 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -108,7 +108,7 @@ node_pools = { # Other variables may be altered system = { cpus = 8 - memory = 16384 + memory = 65536 os_disk = 100 ip_addresses = [ "", @@ -123,13 +123,10 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 150, - 150, + 400, ] ip_addresses = [ "", - "", - "", ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { @@ -137,9 +134,12 @@ node_pools = { } }, compute = { - cpus = 16 - memory = 131072 + cpus = 4 + memory = 16384 os_disk = 100 + misc_disks = [ + 400, + ] ip_addresses = [ "", ] @@ -150,14 +150,15 @@ node_pools = { } }, stateful = { - cpus = 8 - memory = 32768 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, ] ip_addresses = [ "", + "", ] node_taints = ["workload.sas.com/class=stateful:NoSchedule"] node_labels = { @@ -165,8 +166,8 @@ node_pools = { } }, stateless = { - cpus = 8 - memory = 32768 + cpus = 4 + memory = 16384 os_disk = 100 misc_disks = [ 150, @@ -174,6 +175,8 @@ node_pools = { ip_addresses = [ "", "", + "", + "", ] node_taints = ["workload.sas.com/class=stateless:NoSchedule"] node_labels = { @@ -211,17 +214,17 @@ jump_ip = "" # Assigned values for static IPs # NFS server create_nfs = true # Creation flag -nfs_num_cpu = 8 # 8 CPUs +nfs_num_cpu = 4 # 4 CPUs nfs_memory = 16384 # 16 GB -nfs_disk_size = 500 # 500 GB +nfs_disk_size = 400 # 400 GB nfs_ip = "" # Assigned values for static IPs # Postgres Servers postgres_servers = { default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 128 GB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag From 0501807496d744108b64060a6400ed2e85f852a1 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 09:59:47 -0400 Subject: [PATCH 04/11] update sample-terraform-minimal.tfvars --- examples/vsphere/sample-terraform-dhcp.tfvars | 2 +- .../vsphere/sample-terraform-minimal.tfvars | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 87fcb06..6fcf007 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -53,7 +53,7 @@ cluster_lb_type = "kube_vip" # Load Balancer accepted values [kube_vip,metallb] # "cidr-global: 192.168.0.240/29" # CIDR-based range which can be used in any Namespace # ] # -# MetelLB sample: +# MetalLB sample: # # cluster_lb_addresses = [ # "192.168.10.0/24", diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index 724ed3b..cf120f9 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -99,7 +99,7 @@ node_pools = { system = { count = 1 cpus = 8 - memory = 16384 + memory = 65536 os_disk = 100 node_taints = [] node_labels = { @@ -107,13 +107,12 @@ node_pools = { } }, cas = { - count = 3 + count = 1 cpus = 8 - memory = 16384 - os_disk = 100 + memory = 131072 + os_disk = 350 misc_disks = [ - 150, - 150, + 400 ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { @@ -145,17 +144,17 @@ jump_ip = "" # Assigned values for static IPs # NFS server create_nfs = true # Creation flag -nfs_num_cpu = 8 # 8 CPUs +nfs_num_cpu = 4 # 4 CPUs nfs_memory = 16384 # 16 GB -nfs_disk_size = 500 # 500 GB +nfs_disk_size = 400 # 400 GB nfs_ip = "" # Assigned values for static IPs # Postgres Servers postgres_servers = { default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 128 GB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag From 884112b846581546b3ba8f70a70f7083d47f7083 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 10:02:08 -0400 Subject: [PATCH 05/11] update sample-terraform-minimal.tfvars --- examples/vsphere/sample-terraform-minimal.tfvars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index cf120f9..905ad8b 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -108,11 +108,11 @@ node_pools = { }, cas = { count = 1 - cpus = 8 + cpus = 16 memory = 131072 os_disk = 350 misc_disks = [ - 400 + 400, ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { From 6dcd03e4af29537d6225b1ba190e32e34e398801 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 13:09:29 -0400 Subject: [PATCH 06/11] update sample-terraform-vi.tfvars --- examples/vsphere/sample-terraform-vi.tfvars | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index 4028e37..dccab79 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -99,7 +99,7 @@ node_pools = { system = { count = 1 cpus = 8 - memory = 16384 + memory = 65536 os_disk = 100 node_taints = [] node_labels = { @@ -107,10 +107,13 @@ node_pools = { } }, cas = { - count = 3 - cpus = 8 - memory = 16384 - os_disk = 100 + count = 1 + cpus = 16 + memory = 131072 + os_disk = 350 + misc_disks = [ + 400, + ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { "workload.sas.com/class" = "cas" @@ -138,17 +141,17 @@ jump_ip = "" # Assigned values for static IPs # NFS server create_nfs = true # Creation flag -nfs_num_cpu = 8 # 8 CPUs +nfs_num_cpu = 4 # 4 CPUs nfs_memory = 16384 # 16 GB -nfs_disk_size = 500 # 500 GB +nfs_disk_size = 400 # 400 GB nfs_ip = "" # Assigned values for static IPs # Postgres Servers postgres_servers = { default = { - server_num_cpu = 8 # 8 CPUs + server_num_cpu = 4 # 4 CPUs server_memory = 16384 # 16 GB - server_disk_size = 250 # 256 GB + server_disk_size = 128 # 128 GB server_ip = "" # Assigned values for static IPs server_version = 15 # PostgreSQL version server_ssl = "off" # SSL flag From c336e5c3e306c9054f3a58aeeb1241accb4ee145 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 14:26:07 -0400 Subject: [PATCH 07/11] re-add singlestore to DHCP example --- examples/vsphere/sample-terraform-dhcp.tfvars | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 6fcf007..036bcc0 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -157,6 +157,21 @@ node_pools = { node_taints = ["workload.sas.com/class=stateless:NoSchedule"] node_labels = { "workload.sas.com/class" = "stateless" + }, + singlestore = { + count = 3 + cpus = 16 + memory = 131072 + os_disk = 100 + misc_disks = [ + 150, + 150, + 250, + 250, + ] + node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] + node_labels = { + "workload.sas.com/class" = "singlestore" } } } From 371e685dc500b1358f48808c1578ec0a3e324e4e Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 15:41:33 -0400 Subject: [PATCH 08/11] changes after comments --- examples/vsphere/sample-terraform-dhcp.tfvars | 12 +++++------- examples/vsphere/sample-terraform-minimal.tfvars | 3 ++- examples/vsphere/sample-terraform-static-ips.tfvars | 10 ++++------ .../sample-terraform-static-singlestore.tfvars | 10 ++++------ examples/vsphere/sample-terraform-vi.tfvars | 3 ++- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 036bcc0..3c353e6 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -112,7 +112,8 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 400, + 150, + 150, ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { @@ -121,12 +122,9 @@ node_pools = { }, compute = { count = 1 - cpus = 4 - memory = 16384 + cpus = 16 + memory = 131072 os_disk = 100 - misc_disks = [ - 400, - ] node_taints = ["workload.sas.com/class=compute:NoSchedule"] node_labels = { "workload.sas.com/class" = "compute" @@ -158,7 +156,7 @@ node_pools = { node_labels = { "workload.sas.com/class" = "stateless" }, - singlestore = { + singlestore = { count = 3 cpus = 16 memory = 131072 diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index 905ad8b..c2f3a70 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -112,7 +112,8 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 400, + 150, + 150, ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index e98af0e..40687d2 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -117,7 +117,8 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 400, + 150, + 150, ] ip_addresses = [ "", @@ -128,12 +129,9 @@ node_pools = { } }, compute = { - cpus = 4 - memory = 16384 + cpus = 16 + memory = 131072 os_disk = 100 - misc_disks = [ - 400, - ] ip_addresses = [ "", ] diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index b319da0..2dad967 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -123,7 +123,8 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 400, + 150, + 150, ] ip_addresses = [ "", @@ -134,12 +135,9 @@ node_pools = { } }, compute = { - cpus = 4 - memory = 16384 + cpus = 16 + memory = 131072 os_disk = 100 - misc_disks = [ - 400, - ] ip_addresses = [ "", ] diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index dccab79..265d1bc 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -112,7 +112,8 @@ node_pools = { memory = 131072 os_disk = 350 misc_disks = [ - 400, + 150, + 150, ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { From 2f630b18be7248e85e4d848c244c1a0dfadb97f5 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 15:55:15 -0400 Subject: [PATCH 09/11] formatting --- examples/vsphere/sample-terraform-dhcp.tfvars | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 3c353e6..91f54fd 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -107,10 +107,10 @@ node_pools = { } }, cas = { - count = 1 - cpus = 16 - memory = 131072 - os_disk = 350 + count = 1 + cpus = 16 + memory = 131072 + os_disk = 350 misc_disks = [ 150, 150, @@ -132,10 +132,10 @@ node_pools = { } }, stateful = { - count = 2 - cpus = 4 - memory = 16384 - os_disk = 100 + count = 2 + cpus = 4 + memory = 16384 + os_disk = 100 misc_disks = [ 150, ] @@ -145,10 +145,10 @@ node_pools = { } }, stateless = { - count = 4 - cpus = 4 - memory = 16384 - os_disk = 100 + count = 4 + cpus = 4 + memory = 16384 + os_disk = 100 misc_disks = [ 150, ] @@ -156,20 +156,21 @@ node_pools = { node_labels = { "workload.sas.com/class" = "stateless" }, - singlestore = { - count = 3 - cpus = 16 - memory = 131072 - os_disk = 100 - misc_disks = [ - 150, - 150, - 250, - 250, - ] - node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] - node_labels = { - "workload.sas.com/class" = "singlestore" + singlestore = { + count = 3 + cpus = 16 + memory = 131072 + os_disk = 100 + misc_disks = [ + 150, + 150, + 250, + 250, + ] + node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] + node_labels = { + "workload.sas.com/class" = "singlestore" + } } } } From 8dba18b37255a8d9469148a4cd53911c0ec94150 Mon Sep 17 00:00:00 2001 From: jarpat Date: Wed, 5 Jun 2024 15:58:04 -0400 Subject: [PATCH 10/11] formatting --- examples/vsphere/sample-terraform-dhcp.tfvars | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 91f54fd..57cdbf5 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -155,22 +155,22 @@ node_pools = { node_taints = ["workload.sas.com/class=stateless:NoSchedule"] node_labels = { "workload.sas.com/class" = "stateless" - }, - singlestore = { - count = 3 - cpus = 16 - memory = 131072 - os_disk = 100 - misc_disks = [ - 150, - 150, - 250, - 250, - ] - node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] - node_labels = { - "workload.sas.com/class" = "singlestore" - } + } + }, + singlestore = { + count = 3 + cpus = 16 + memory = 131072 + os_disk = 100 + misc_disks = [ + 150, + 150, + 250, + 250, + ] + node_taints = ["workload.sas.com/class=singlestore:NoSchedule"] + node_labels = { + "workload.sas.com/class" = "singlestore" } } } From 7e04aa02c1dce9a7e77ab46af7f6bffbe40088a4 Mon Sep 17 00:00:00 2001 From: jarpat Date: Thu, 6 Jun 2024 10:38:50 -0400 Subject: [PATCH 11/11] revert count --- examples/vsphere/sample-terraform-dhcp.tfvars | 2 +- examples/vsphere/sample-terraform-minimal.tfvars | 2 +- examples/vsphere/sample-terraform-static-ips.tfvars | 2 ++ examples/vsphere/sample-terraform-static-singlestore.tfvars | 2 ++ examples/vsphere/sample-terraform-vi.tfvars | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index 57cdbf5..73ab3c7 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -107,7 +107,7 @@ node_pools = { } }, cas = { - count = 1 + count = 3 cpus = 16 memory = 131072 os_disk = 350 diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index c2f3a70..aa8bfa0 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -107,7 +107,7 @@ node_pools = { } }, cas = { - count = 1 + count = 3 cpus = 16 memory = 131072 os_disk = 350 diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index 40687d2..e209880 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -122,6 +122,8 @@ node_pools = { ] ip_addresses = [ "", + "", + "", ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index 2dad967..28b2353 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -128,6 +128,8 @@ node_pools = { ] ip_addresses = [ "", + "", + "", ] node_taints = ["workload.sas.com/class=cas:NoSchedule"] node_labels = { diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index 265d1bc..d3403e6 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -107,7 +107,7 @@ node_pools = { } }, cas = { - count = 1 + count = 3 cpus = 16 memory = 131072 os_disk = 350