Skip to content

Commit 169ae13

Browse files
jarpatjarpat
authored
Merge pull request #128 from sassoftware/staging
3.12.0 - June 28, 2024
2 parents e97e16d + 98373e4 commit 169ae13

9 files changed

+81
-71
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \
1010
FROM baseline as tool_builder
1111
ARG HELM_VERSION=3.14.4
1212
ARG KUBECTL_VERSION=1.28.7
13-
ARG TERRAFORM_VERSION=1.7.4-*
13+
ARG TERRAFORM_VERSION=1.8.5-*
1414

1515
WORKDIR /build
1616

‎docs/CONFIG-VARS.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ jump_ip = "" # Assigned values for static IP addresses
257257
| :--- | :--- | :--- | :--- | :--- |
258258
| create_nfs | Creation flag | bool | false | |
259259
| nfs_num_cpu | # of CPUs | number | 4 | |
260-
| nfs_memory | Memory in MB | number | 8092 | |
261-
| nfs_disk_size | Size of disk in GB | number | 250 | |
260+
| nfs_memory | Memory in MB | number | 16384 | |
261+
| nfs_disk_size | Size of disk in GB | number | 400 | |
262262
| nfs_ip | Static IP for NFS server | string | | |
263263

264264
Sample:
@@ -293,9 +293,9 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
293293

294294
| Name | Description | Type | Default | Notes |
295295
| :--- | :--- | :--- | :--- | :--- |
296-
| server_num_cpu | # of CPUs | number | 8 | |
296+
| server_num_cpu | # of CPUs | number | 4 | |
297297
| server_memory | Memory in MB | number | 16385 | |
298-
| server_disk_size | Size of disk in GB | number | 250 | |
298+
| server_disk_size | Size of disk in GB | number | 128 | |
299299
| server_ip | Static IP address for PostgreSQL server | string | | This is a required field. |
300300
| 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. |
301301
| server_ssl | Enable/disable SSL | string | "off" | |
@@ -322,9 +322,9 @@ postgres_servers = {
322322
server_ip = "10.10.10.10" # Assigned values for static IPs
323323
},
324324
cds-postgres = {
325-
server_num_cpu = 8 # 8 CPUs
325+
server_num_cpu = 4 # 8 CPUs
326326
server_memory = 16384 # 16 GB
327-
server_disk_size = 250 # 256 GB
327+
server_disk_size = 128 # 256 GB
328328
server_ip = "10.10.10.11" # Assigned values for static IPs
329329
server_version = 15 # PostgreSQL version
330330
server_ssl = "on" # SSL flag

‎docs/REQUIREMENTS.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ The following table lists the minimum machine requirements that are needed to su
4646
| **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 |
4747
| **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 |
4848
| **Jump Server** | 4 | 8 GB | 100 GB | Bastion box that is used to access NFS mounts, share data, etc. | 1 |
49-
| **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 |
50-
| **PostgreSQL Servers** | 8 | 16 GB | 250 GB | PostgreSQL servers for your SAS Viya platform deployment. | 1..n |
49+
| **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 |
50+
| **PostgreSQL Servers** | 4 | 16 GB | 128 GB | PostgreSQL servers for your SAS Viya platform deployment. | 1..n |
5151

5252
### VMware vSphere or vCenter
5353

@@ -682,6 +682,6 @@ The third-party applications that are listed in the following table are supporte
682682
| Application | Minimum Version |
683683
| ---: | ---: |
684684
| [Ansible](https://www.ansible.com/) | Core 2.16.1 |
685-
| [Terraform](https://www.terraform.io/) | 1.7.4 |
685+
| [Terraform](https://www.terraform.io/) | 1.8.5 |
686686
| [Docker](https://www.docker.com/) | 20.10.17 |
687687
| [Helm](https://helm.sh/) | 3.14.4 |

‎examples/vsphere/sample-terraform-dhcp.tfvars

+22-22
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ cluster_lb_type = "kube_vip" # Load Balancer accepted values [kube_vip,metallb]
5353
# "cidr-global: 192.168.0.240/29" # CIDR-based range which can be used in any Namespace
5454
# ]
5555
#
56-
# MetelLB sample:
56+
# MetalLB sample:
5757
#
5858
# cluster_lb_addresses = [
5959
# "192.168.10.0/24",
@@ -99,18 +99,18 @@ node_pools = {
9999
system = {
100100
count = 1
101101
cpus = 8
102-
memory = 16384
102+
memory = 65536
103103
os_disk = 100
104104
node_taints = []
105105
node_labels = {
106106
"kubernetes.azure.com/mode" = "system" # REQUIRED LABEL - DO NOT REMOVE
107107
}
108108
},
109109
cas = {
110-
count = 3
111-
cpus = 16
112-
memory = 131072
113-
os_disk = 350
110+
count = 3
111+
cpus = 16
112+
memory = 131072
113+
os_disk = 350
114114
misc_disks = [
115115
150,
116116
150,
@@ -132,10 +132,10 @@ node_pools = {
132132
}
133133
},
134134
stateful = {
135-
count = 1
136-
cpus = 8
137-
memory = 32768
138-
os_disk = 100
135+
count = 2
136+
cpus = 4
137+
memory = 16384
138+
os_disk = 100
139139
misc_disks = [
140140
150,
141141
]
@@ -145,10 +145,10 @@ node_pools = {
145145
}
146146
},
147147
stateless = {
148-
count = 2
149-
cpus = 8
150-
memory = 32768
151-
os_disk = 100
148+
count = 4
149+
cpus = 4
150+
memory = 16384
151+
os_disk = 100
152152
misc_disks = [
153153
150,
154154
]
@@ -158,10 +158,10 @@ node_pools = {
158158
}
159159
},
160160
singlestore = {
161-
count = 3
162-
cpus = 16
163-
memory = 131072
164-
os_disk = 100
161+
count = 3
162+
cpus = 16
163+
memory = 131072
164+
os_disk = 100
165165
misc_disks = [
166166
150,
167167
150,
@@ -184,17 +184,17 @@ jump_ip = "" # Assigned values for static IPs
184184

185185
# NFS server
186186
create_nfs = true # Creation flag
187-
nfs_num_cpu = 8 # 8 CPUs
187+
nfs_num_cpu = 4 # 4 CPUs
188188
nfs_memory = 16384 # 16 GB
189-
nfs_disk_size = 500 # 500 GB
189+
nfs_disk_size = 400 # 400 GB
190190
nfs_ip = "" # Assigned values for static IPs
191191

192192
# Postgres Servers
193193
postgres_servers = {
194194
default = {
195-
server_num_cpu = 8 # 8 CPUs
195+
server_num_cpu = 4 # 4 CPUs
196196
server_memory = 16384 # 16 GB
197-
server_disk_size = 250 # 256 GB
197+
server_disk_size = 128 # 128 GB
198198
server_ip = "" # Assigned values for static IPs
199199
server_version = 15 # PostgreSQL version
200200
server_ssl = "off" # SSL flag

‎examples/vsphere/sample-terraform-minimal.tfvars

+8-8
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ node_pools = {
9999
system = {
100100
count = 1
101101
cpus = 8
102-
memory = 16384
102+
memory = 65536
103103
os_disk = 100
104104
node_taints = []
105105
node_labels = {
@@ -108,9 +108,9 @@ node_pools = {
108108
},
109109
cas = {
110110
count = 3
111-
cpus = 8
112-
memory = 16384
113-
os_disk = 100
111+
cpus = 16
112+
memory = 131072
113+
os_disk = 350
114114
misc_disks = [
115115
150,
116116
150,
@@ -145,17 +145,17 @@ jump_ip = "" # Assigned values for static IPs
145145

146146
# NFS server
147147
create_nfs = true # Creation flag
148-
nfs_num_cpu = 8 # 8 CPUs
148+
nfs_num_cpu = 4 # 4 CPUs
149149
nfs_memory = 16384 # 16 GB
150-
nfs_disk_size = 500 # 500 GB
150+
nfs_disk_size = 400 # 400 GB
151151
nfs_ip = "" # Assigned values for static IPs
152152

153153
# Postgres Servers
154154
postgres_servers = {
155155
default = {
156-
server_num_cpu = 8 # 8 CPUs
156+
server_num_cpu = 4 # 4 CPUs
157157
server_memory = 16384 # 16 GB
158-
server_disk_size = 250 # 256 GB
158+
server_disk_size = 128 # 128 GB
159159
server_ip = "" # Assigned values for static IPs
160160
server_version = 15 # PostgreSQL version
161161
server_ssl = "off" # SSL flag

‎examples/vsphere/sample-terraform-static-ips.tfvars

+12-9
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ node_pools = {
102102
# Other variables may be altered
103103
system = {
104104
cpus = 8
105-
memory = 16384
105+
memory = 65536
106106
os_disk = 100
107107
ip_addresses = [
108108
"",
@@ -144,30 +144,33 @@ node_pools = {
144144
}
145145
},
146146
stateful = {
147-
cpus = 8
148-
memory = 32768
147+
cpus = 4
148+
memory = 16384
149149
os_disk = 100
150150
misc_disks = [
151151
150,
152152
]
153153
ip_addresses = [
154154
"",
155+
"",
155156
]
156157
node_taints = ["workload.sas.com/class=stateful:NoSchedule"]
157158
node_labels = {
158159
"workload.sas.com/class" = "stateful"
159160
}
160161
},
161162
stateless = {
162-
cpus = 8
163-
memory = 32768
163+
cpus = 4
164+
memory = 16384
164165
os_disk = 100
165166
misc_disks = [
166167
150,
167168
]
168169
ip_addresses = [
169170
"",
170171
"",
172+
"",
173+
"",
171174
]
172175
node_taints = ["workload.sas.com/class=stateless:NoSchedule"]
173176
node_labels = {
@@ -185,17 +188,17 @@ jump_ip = "" # Assigned values for static IPs
185188

186189
# NFS server
187190
create_nfs = true # Creation flag
188-
nfs_num_cpu = 8 # 8 CPUs
191+
nfs_num_cpu = 4 # 4 CPUs
189192
nfs_memory = 16384 # 16 GB
190-
nfs_disk_size = 500 # 500 GB
193+
nfs_disk_size = 400 # 400 GB
191194
nfs_ip = "" # Assigned values for static IPs
192195

193196
# Postgres Servers
194197
postgres_servers = {
195198
default = {
196-
server_num_cpu = 8 # 8 CPUs
199+
server_num_cpu = 4 # 4 CPUs
197200
server_memory = 16384 # 16 GB
198-
server_disk_size = 250 # 256 GB
201+
server_disk_size = 128 # 128 GB
199202
server_ip = "" # Assigned values for static IPs
200203
server_version = 15 # PostgreSQL version
201204
server_ssl = "off" # SSL flag

‎examples/vsphere/sample-terraform-static-singlestore.tfvars

+12-9
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ node_pools = {
108108
# Other variables may be altered
109109
system = {
110110
cpus = 8
111-
memory = 16384
111+
memory = 65536
112112
os_disk = 100
113113
ip_addresses = [
114114
"",
@@ -150,30 +150,33 @@ node_pools = {
150150
}
151151
},
152152
stateful = {
153-
cpus = 8
154-
memory = 32768
153+
cpus = 4
154+
memory = 16384
155155
os_disk = 100
156156
misc_disks = [
157157
150,
158158
]
159159
ip_addresses = [
160160
"",
161+
"",
161162
]
162163
node_taints = ["workload.sas.com/class=stateful:NoSchedule"]
163164
node_labels = {
164165
"workload.sas.com/class" = "stateful"
165166
}
166167
},
167168
stateless = {
168-
cpus = 8
169-
memory = 32768
169+
cpus = 4
170+
memory = 16384
170171
os_disk = 100
171172
misc_disks = [
172173
150,
173174
]
174175
ip_addresses = [
175176
"",
176177
"",
178+
"",
179+
"",
177180
]
178181
node_taints = ["workload.sas.com/class=stateless:NoSchedule"]
179182
node_labels = {
@@ -211,17 +214,17 @@ jump_ip = "" # Assigned values for static IPs
211214

212215
# NFS server
213216
create_nfs = true # Creation flag
214-
nfs_num_cpu = 8 # 8 CPUs
217+
nfs_num_cpu = 4 # 4 CPUs
215218
nfs_memory = 16384 # 16 GB
216-
nfs_disk_size = 500 # 500 GB
219+
nfs_disk_size = 400 # 400 GB
217220
nfs_ip = "" # Assigned values for static IPs
218221

219222
# Postgres Servers
220223
postgres_servers = {
221224
default = {
222-
server_num_cpu = 8 # 8 CPUs
225+
server_num_cpu = 4 # 4 CPUs
223226
server_memory = 16384 # 16 GB
224-
server_disk_size = 250 # 256 GB
227+
server_disk_size = 128 # 128 GB
225228
server_ip = "" # Assigned values for static IPs
226229
server_version = 15 # PostgreSQL version
227230
server_ssl = "off" # SSL flag

‎examples/vsphere/sample-terraform-vi.tfvars

+13-9
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,22 @@ node_pools = {
9999
system = {
100100
count = 1
101101
cpus = 8
102-
memory = 16384
102+
memory = 65536
103103
os_disk = 100
104104
node_taints = []
105105
node_labels = {
106106
"kubernetes.azure.com/mode" = "system" # REQUIRED LABEL - DO NOT REMOVE
107107
}
108108
},
109109
cas = {
110-
count = 3
111-
cpus = 8
112-
memory = 16384
113-
os_disk = 100
110+
count = 3
111+
cpus = 16
112+
memory = 131072
113+
os_disk = 350
114+
misc_disks = [
115+
150,
116+
150,
117+
]
114118
node_taints = ["workload.sas.com/class=cas:NoSchedule"]
115119
node_labels = {
116120
"workload.sas.com/class" = "cas"
@@ -138,17 +142,17 @@ jump_ip = "" # Assigned values for static IPs
138142

139143
# NFS server
140144
create_nfs = true # Creation flag
141-
nfs_num_cpu = 8 # 8 CPUs
145+
nfs_num_cpu = 4 # 4 CPUs
142146
nfs_memory = 16384 # 16 GB
143-
nfs_disk_size = 500 # 500 GB
147+
nfs_disk_size = 400 # 400 GB
144148
nfs_ip = "" # Assigned values for static IPs
145149

146150
# Postgres Servers
147151
postgres_servers = {
148152
default = {
149-
server_num_cpu = 8 # 8 CPUs
153+
server_num_cpu = 4 # 4 CPUs
150154
server_memory = 16384 # 16 GB
151-
server_disk_size = 250 # 256 GB
155+
server_disk_size = 128 # 128 GB
152156
server_ip = "" # Assigned values for static IPs
153157
server_version = 15 # PostgreSQL version
154158
server_ssl = "off" # SSL flag

0 commit comments

Comments
 (0)