Merge pull request #128 from sassoftware/staging

3.12.0 - June 28, 2024
sassoftware · Jun 28, 2024 · 169ae13 · 169ae13
2 parents e97e16d + 98373e4
commit 169ae13
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 71 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \
 FROM baseline as tool_builder
 ARG HELM_VERSION=3.14.4
 ARG KUBECTL_VERSION=1.28.7
-ARG TERRAFORM_VERSION=1.7.4-*
+ARG TERRAFORM_VERSION=1.8.5-*
 
 WORKDIR /build
 

diff --git 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
@@ -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
 
@@ -682,6 +682,6 @@ The third-party applications that are listed in the following table are supporte
 | Application | Minimum Version |
 | ---: | ---: |
 | [Ansible](https://www.ansible.com/) | Core 2.16.1 |
-| [Terraform](https://www.terraform.io/) | 1.7.4 |
+| [Terraform](https://www.terraform.io/) | 1.8.5 |
 | [Docker](https://www.docker.com/) | 20.10.17 |
 | [Helm](https://helm.sh/) | 3.14.4 |
diff --git 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",
@@ -99,18 +99,18 @@ node_pools = {
   system = {
     count       = 1
     cpus        = 8
-    memory      = 16384
+    memory      = 65536
     os_disk     = 100
     node_taints = []
     node_labels = {
       "kubernetes.azure.com/mode" = "system" # REQUIRED LABEL - DO NOT REMOVE
     }
   },
   cas = {
-    count   = 3
-    cpus    = 16
-    memory  = 131072
-    os_disk = 350
+    count      = 3
+    cpus       = 16
+    memory     = 131072
+    os_disk    = 350
     misc_disks = [
       150,
       150,
@@ -132,10 +132,10 @@ node_pools = {
     }
   },
   stateful = {
-    count   = 1
-    cpus    = 8
-    memory  = 32768
-    os_disk = 100
+    count      = 2
+    cpus       = 4
+    memory     = 16384
+    os_disk    = 100
     misc_disks = [
       150,
     ]
@@ -145,10 +145,10 @@ node_pools = {
     }
   },
   stateless = {
-    count   = 2
-    cpus    = 8
-    memory  = 32768
-    os_disk = 100
+    count      = 4
+    cpus       = 4
+    memory     = 16384
+    os_disk    = 100
     misc_disks = [
       150,
     ]
@@ -158,10 +158,10 @@ node_pools = {
     }
   },
   singlestore = {
-    count   = 3
-    cpus    = 16
-    memory  = 131072
-    os_disk = 100
+    count      = 3
+    cpus       = 16
+    memory     = 131072
+    os_disk    = 100
     misc_disks = [
       150,
       150,
@@ -184,17 +184,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/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 = {
@@ -108,9 +108,9 @@ node_pools = {
   },
   cas = {
     count   = 3
-    cpus    = 8
-    memory  = 16384
-    os_disk = 100
+    cpus    = 16
+    memory  = 131072
+    os_disk = 350
     misc_disks = [
       150,
       150,
@@ -145,17 +145,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/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 = [
       "",
@@ -144,30 +144,33 @@ 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 = {
       "workload.sas.com/class" = "stateful"
     }
   },
   stateless = {
-    cpus    = 8
-    memory  = 32768
+    cpus    = 4
+    memory  = 16384
     os_disk = 100
     misc_disks = [
       150,
     ]
     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

diff --git 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 = [
       "",
@@ -150,30 +150,33 @@ 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 = {
       "workload.sas.com/class" = "stateful"
     }
   },
   stateless = {
-    cpus    = 8
-    memory  = 32768
+    cpus    = 4
+    memory  = 16384
     os_disk = 100
     misc_disks = [
       150,
     ]
     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

diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars
@@ -99,18 +99,22 @@ node_pools = {
   system = {
     count       = 1
     cpus        = 8
-    memory      = 16384
+    memory      = 65536
     os_disk     = 100
     node_taints = []
     node_labels = {
       "kubernetes.azure.com/mode" = "system" # REQUIRED LABEL - DO NOT REMOVE
     }
   },
   cas = {
-    count       = 3
-    cpus        = 8
-    memory      = 16384
-    os_disk     = 100
+    count   = 3
+    cpus    = 16
+    memory  = 131072
+    os_disk = 350
+    misc_disks = [
+      150,
+      150,
+    ]
     node_taints = ["workload.sas.com/class=cas:NoSchedule"]
     node_labels = {
       "workload.sas.com/class" = "cas"
@@ -138,17 +142,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