From c5076047dfd686a3049d1cbd0cadbf0fd157f2a6 Mon Sep 17 00:00:00 2001 From: jarpat Date: Mon, 3 Jun 2024 10:44:11 -0400 Subject: [PATCH] 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