Skip to content

Commit 235032e

Browse files
jarpatjarpat
authored
Merge pull request #392 from sassoftware/staging
9.4.0 - June 28, 2024
2 parents df730eb + 06e5070 commit 235032e

12 files changed

+86
-86
lines changed

‎docs/CONFIG-VARS.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Ubuntu 20.04 LTS is the operating system used on the Jump/NFS servers. Ubuntu cr
219219
| Name | Description | Type | Default | Notes |
220220
| :--- | ---: | ---: | ---: | ---: |
221221
| node_vm_admin | Operating system Admin User for VMs of AKS cluster nodes | string | "azureuser" | |
222-
| default_nodepool_vm_type | Type of the default node pool VMs | string | "Standard_D8s_v4" | |
222+
| default_nodepool_vm_type | Type of the default node pool VMs | string | "Standard_E8s_v5" | |
223223
| default_nodepool_os_disk_size | Disk size for default node pool VMs in GB | number | 128 ||
224224
| default_nodepool_max_pods | Maximum number of pods that can run on each | number | 110 | Changing this forces a new resource to be created. |
225225
| default_nodepool_min_nodes | Minimum and initial number of nodes for the default node pool | number | 1 | Value must be between 0 and 100. Setting min and max node counts the same disables autoscaling. |
@@ -247,7 +247,7 @@ The default values for the `node_pools` variable are as follows:
247247
```yaml
248248
{
249249
cas = {
250-
"machine_type" = "Standard_E16s_v3"
250+
"machine_type" = "Standard_E16ds_v5"
251251
"os_disk_size" = 200
252252
"min_nodes" = 0
253253
"max_nodes" = 5
@@ -258,7 +258,7 @@ The default values for the `node_pools` variable are as follows:
258258
}
259259
},
260260
compute = {
261-
"machine_type" = "Standard_E16s_v3"
261+
"machine_type" = "Standard_D4ds_v5"
262262
"os_disk_size" = 200
263263
"min_nodes" = 1
264264
"max_nodes" = 5
@@ -270,7 +270,7 @@ The default values for the `node_pools` variable are as follows:
270270
}
271271
},
272272
stateless = {
273-
"machine_type" = "Standard_D16s_v3"
273+
"machine_type" = "Standard_D4s_v5"
274274
"os_disk_size" = 200
275275
"min_nodes" = 0
276276
"max_nodes" = 5
@@ -281,7 +281,7 @@ The default values for the `node_pools` variable are as follows:
281281
}
282282
},
283283
stateful = {
284-
"machine_type" = "Standard_D8s_v3"
284+
"machine_type" = "Standard_D4s_v5"
285285
"os_disk_size" = 200
286286
"min_nodes" = 0
287287
"max_nodes" = 3
@@ -320,10 +320,10 @@ When `storage_type=standard`, a NFS Server VM is created, only when these variab
320320
| create_nfs_public_ip | Add public ip to the NFS server VM | bool | false | |
321321
| enable_nfs_public_static_ip | Enables `Static` allocation method for the public IP address of NFS Server. Setting false will enable `Dynamic` allocation method | bool | true | Only used with `create_nfs_public_ip=true` |
322322
| nfs_vm_admin | OS Admin User for the NFS server VM | string | "nfsuser" | |
323-
| nfs_vm_machine_type | SKU to use for NFS server VM | string | "Standard_D8s_v4" | To check for valid types for your subscription, run: `az vm list-skus --resource-type virtualMachines --subscription $subscription --location $location -o table`|
323+
| nfs_vm_machine_type | SKU to use for NFS server VM | string | "Standard_D4s_v5" | To check for valid types for your subscription, run: `az vm list-skus --resource-type virtualMachines --subscription $subscription --location $location -o table`|
324324
| nfs_vm_zone | Zone in which NFS server VM should be created | string | null | |
325325
| nfs_raid_disk_type | Managed disk types | string | "Standard_LRS" | Supported values: Standard_LRS, Premium_LRS, StandardSSD_LRS or UltraSSD_LRS. When using `UltraSSD_LRS`, `nfs_vm_zone` and `nfs_raid_disk_zone` must be specified. See the [Azure documentation](https://docs.microsoft.com/en-us/azure/virtual-machines/disks-enable-ultra-ssd) for limitations on Availability Zones and VM types. |
326-
| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 128 | |
326+
| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 256 | |
327327
| nfs_raid_disk_zone | The Availability Zone in which the Managed Disk should be located. Changing this property forces a new resource to be created. | string | null | |
328328

329329
### Azure NetApp Files (only when `storage_type=ha`)
@@ -368,8 +368,8 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
368368

369369
| Name | Description | Type | Default | Notes |
370370
| :--- | ---: | ---: | ---: | ---: |
371-
| sku_name| The SKU Name for the PostgreSQL Flexible Server | string | "GP_Standard_D16s_v3" | The name pattern is the SKU, followed by the tier + family + cores (e.g. B_Standard_B1ms, GP_Standard_D2s_v3, MO_Standard_E4s_v3).|
372-
| storage_mb | The max storage allowed for the PostgreSQL Flexible Server | number | 65536 | Possible values are 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, and 33554432. |
371+
| sku_name| The SKU Name for the PostgreSQL Flexible Server | string | "GP_Standard_D4ds_v5" | The name pattern is the SKU, followed by the tier + family + cores (e.g. B_Standard_B1ms, GP_Standard_D2s_v3, MO_Standard_E4s_v3).|
372+
| storage_mb | The max storage allowed for the PostgreSQL Flexible Server | number | 131072 | Possible values are 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, and 33554432. |
373373
| backup_retention_days | Backup retention days for the PostgreSQL Flexible server | number | 7 | Supported values are between 7 and 35 days. |
374374
| geo_redundant_backup_enabled | Enable Geo-redundant or not for server backup | bool | false | Not supported for the basic tier. |
375375
| administrator_login | The Administrator Login for the PostgreSQL Flexible Server. Changing this forces a new resource to be created. | string | "pgadmin" | The admin login name cannot be azure_superuser, azure_pg_admin, admin, administrator, root, guest, or public. It cannot start with pg_. See: [Microsoft Quickstart Server Database](https://docs.microsoft.com/en-us/azure/postgresql/flexible-server/quickstart-create-server-portal) |
@@ -395,8 +395,8 @@ postgres_servers = {
395395
]
396396
},
397397
cds-postgres = {
398-
sku_name = "GP_Standard_D16s_v3"
399-
storage_mb = 65536
398+
sku_name = "GP_Standard_D4ds_v5"
399+
storage_mb = 131072
400400
backup_retention_days = 7
401401
administrator_login = "pgadmin"
402402
administrator_password = "1tsAB3aut1fulDay"

‎examples/sample-input-byo.tfvars

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ container_registry_admin_enabled = false
4747
# AKS config
4848
kubernetes_version = "1.28"
4949
default_nodepool_min_nodes = 2
50-
default_nodepool_vm_type = "Standard_D8s_v4"
50+
default_nodepool_vm_type = "Standard_E8s_v5"
5151

5252
# AKS Node Pools config
5353
node_pools = {
5454
cas = {
55-
"machine_type" = "Standard_E16s_v3"
55+
"machine_type" = "Standard_E16ds_v5"
5656
"os_disk_size" = 200
5757
"min_nodes" = 1
5858
"max_nodes" = 1
@@ -63,7 +63,7 @@ node_pools = {
6363
}
6464
},
6565
compute = {
66-
"machine_type" = "Standard_E16s_v3"
66+
"machine_type" = "Standard_D4ds_v5"
6767
"os_disk_size" = 200
6868
"min_nodes" = 1
6969
"max_nodes" = 1
@@ -75,21 +75,21 @@ node_pools = {
7575
}
7676
},
7777
stateless = {
78-
"machine_type" = "Standard_D16s_v3"
78+
"machine_type" = "Standard_D4s_v5"
7979
"os_disk_size" = 200
8080
"min_nodes" = 1
81-
"max_nodes" = 2
81+
"max_nodes" = 4
8282
"max_pods" = 110
8383
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
8484
"node_labels" = {
8585
"workload.sas.com/class" = "stateless"
8686
}
8787
},
8888
stateful = {
89-
"machine_type" = "Standard_D8s_v3"
89+
"machine_type" = "Standard_D4s_v5"
9090
"os_disk_size" = 200
9191
"min_nodes" = 1
92-
"max_nodes" = 3
92+
"max_nodes" = 2
9393
"max_pods" = 110
9494
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
9595
"node_labels" = {
@@ -108,6 +108,6 @@ storage_type = "standard"
108108
# required ONLY when storage_type is "standard" to create NFS Server VM
109109
create_nfs_public_ip = false
110110
nfs_vm_admin = "nfsuser"
111-
nfs_vm_machine_type = "Standard_D8s_v4"
112-
nfs_raid_disk_size = 128
111+
nfs_vm_machine_type = "Standard_D4s_v5"
112+
nfs_raid_disk_size = 256
113113
nfs_raid_disk_type = "Standard_LRS"

‎examples/sample-input-connect.tfvars

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ container_registry_admin_enabled = false
3636
# AKS config
3737
kubernetes_version = "1.28"
3838
default_nodepool_min_nodes = 2
39-
default_nodepool_vm_type = "Standard_D8s_v4"
39+
default_nodepool_vm_type = "Standard_E8s_v5"
4040

4141
# AKS Node Pools config
4242
node_pools = {
4343
cas = {
44-
"machine_type" = "Standard_E16s_v3"
44+
"machine_type" = "Standard_E16ds_v5"
4545
"os_disk_size" = 200
4646
"min_nodes" = 1
4747
"max_nodes" = 1
@@ -52,7 +52,7 @@ node_pools = {
5252
}
5353
},
5454
compute = {
55-
"machine_type" = "Standard_E16s_v3"
55+
"machine_type" = "Standard_D4ds_v5"
5656
"os_disk_size" = 200
5757
"min_nodes" = 1
5858
"max_nodes" = 1
@@ -76,21 +76,21 @@ node_pools = {
7676
}
7777
},
7878
stateless = {
79-
"machine_type" = "Standard_D16s_v3"
79+
"machine_type" = "Standard_D4s_v5"
8080
"os_disk_size" = 200
8181
"min_nodes" = 1
82-
"max_nodes" = 2
82+
"max_nodes" = 4
8383
"max_pods" = 110
8484
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
8585
"node_labels" = {
8686
"workload.sas.com/class" = "stateless"
8787
}
8888
},
8989
stateful = {
90-
"machine_type" = "Standard_D8s_v3"
90+
"machine_type" = "Standard_D4s_v5"
9191
"os_disk_size" = 200
9292
"min_nodes" = 1
93-
"max_nodes" = 3
93+
"max_nodes" = 2
9494
"max_pods" = 110
9595
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
9696
"node_labels" = {
@@ -109,6 +109,6 @@ storage_type = "standard"
109109
# required ONLY when storage_type is "standard" to create NFS Server VM
110110
create_nfs_public_ip = false
111111
nfs_vm_admin = "nfsuser"
112-
nfs_vm_machine_type = "Standard_D8s_v4"
113-
nfs_raid_disk_size = 128
112+
nfs_vm_machine_type = "Standard_D4s_v5"
113+
nfs_raid_disk_size = 256
114114
nfs_raid_disk_type = "Standard_LRS"

‎examples/sample-input-ha.tfvars

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ container_registry_admin_enabled = false
3434
# AKS config
3535
kubernetes_version = "1.28"
3636
default_nodepool_min_nodes = 2
37-
default_nodepool_vm_type = "Standard_D8s_v4"
37+
default_nodepool_vm_type = "Standard_E8s_v5"
3838

3939
# AKS Node Pools config
4040
node_pools = {
4141
cas = {
42-
"machine_type" = "Standard_E16s_v3"
42+
"machine_type" = "Standard_E16ds_v5"
4343
"os_disk_size" = 200
4444
"min_nodes" = 2
4545
"max_nodes" = 3
@@ -50,7 +50,7 @@ node_pools = {
5050
}
5151
},
5252
compute = {
53-
"machine_type" = "Standard_E16s_v3"
53+
"machine_type" = "Standard_D4ds_v5"
5454
"os_disk_size" = 200
5555
"min_nodes" = 2
5656
"max_nodes" = 3
@@ -62,18 +62,18 @@ node_pools = {
6262
}
6363
},
6464
stateless = {
65-
"machine_type" = "Standard_D16s_v3"
65+
"machine_type" = "Standard_D4s_v5"
6666
"os_disk_size" = 200
6767
"min_nodes" = 2
68-
"max_nodes" = 3
68+
"max_nodes" = 4
6969
"max_pods" = 110
7070
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
7171
"node_labels" = {
7272
"workload.sas.com/class" = "stateless"
7373
}
7474
},
7575
stateful = {
76-
"machine_type" = "Standard_D8s_v3"
76+
"machine_type" = "Standard_D4s_v5"
7777
"os_disk_size" = 200
7878
"min_nodes" = 2
7979
"max_nodes" = 3

‎examples/sample-input-minimal.tfvars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ storage_type = "standard"
7575
# required ONLY when storage_type is "standard" to create NFS Server VM
7676
create_nfs_public_ip = false
7777
nfs_vm_admin = "nfsuser"
78-
nfs_vm_machine_type = "Standard_D4s_v4"
79-
nfs_raid_disk_size = 128
78+
nfs_vm_machine_type = "Standard_D4s_v5"
79+
nfs_raid_disk_size = 256
8080
nfs_raid_disk_type = "Standard_LRS"

‎examples/sample-input-postgres.tfvars

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ container_registry_admin_enabled = false
8888
# AKS config
8989
kubernetes_version = "1.28"
9090
default_nodepool_min_nodes = 2
91-
default_nodepool_vm_type = "Standard_D8s_v4"
91+
default_nodepool_vm_type = "Standard_E8s_v5"
9292

9393
# AKS Node Pools config
9494
node_pools = {
9595
cas = {
96-
"machine_type" = "Standard_E16s_v3"
96+
"machine_type" = "Standard_E16ds_v5"
9797
"os_disk_size" = 200
9898
"min_nodes" = 1
9999
"max_nodes" = 1
@@ -104,7 +104,7 @@ node_pools = {
104104
}
105105
},
106106
compute = {
107-
"machine_type" = "Standard_E16s_v3"
107+
"machine_type" = "Standard_D4ds_v5"
108108
"os_disk_size" = 200
109109
"min_nodes" = 1
110110
"max_nodes" = 1
@@ -116,21 +116,21 @@ node_pools = {
116116
}
117117
},
118118
stateless = {
119-
"machine_type" = "Standard_D16s_v3"
119+
"machine_type" = "Standard_D4s_v5"
120120
"os_disk_size" = 200
121121
"min_nodes" = 1
122-
"max_nodes" = 2
122+
"max_nodes" = 4
123123
"max_pods" = 110
124124
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
125125
"node_labels" = {
126126
"workload.sas.com/class" = "stateless"
127127
}
128128
},
129129
stateful = {
130-
"machine_type" = "Standard_D8s_v3"
130+
"machine_type" = "Standard_D4s_v5"
131131
"os_disk_size" = 200
132132
"min_nodes" = 1
133-
"max_nodes" = 3
133+
"max_nodes" = 2
134134
"max_pods" = 110
135135
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
136136
"node_labels" = {
@@ -149,6 +149,6 @@ storage_type = "standard"
149149
# required ONLY when storage_type is "standard" to create NFS Server VM
150150
create_nfs_public_ip = false
151151
nfs_vm_admin = "nfsuser"
152-
nfs_vm_machine_type = "Standard_D8s_v4"
153-
nfs_raid_disk_size = 128
152+
nfs_vm_machine_type = "Standard_D4s_v5"
153+
nfs_raid_disk_size = 256
154154
nfs_raid_disk_type = "Standard_LRS"

‎examples/sample-input-ppg.tfvars

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ container_registry_admin_enabled = false
3535
# AKS config
3636
kubernetes_version = "1.28"
3737
default_nodepool_min_nodes = 2
38-
default_nodepool_vm_type = "Standard_D8s_v4"
38+
default_nodepool_vm_type = "Standard_E8s_v5"
3939

4040
## Azure Proximity Placement / Availability Zone config
4141
# !NOTE! - If proximity placement groups are required for your deployment
@@ -50,7 +50,7 @@ node_pools_availability_zone = ""
5050
# AKS Node Pools config
5151
node_pools = {
5252
cas = {
53-
"machine_type" = "Standard_E16s_v3"
53+
"machine_type" = "Standard_E16ds_v5"
5454
"os_disk_size" = 200
5555
"min_nodes" = 1
5656
"max_nodes" = 1
@@ -61,7 +61,7 @@ node_pools = {
6161
}
6262
},
6363
compute = {
64-
"machine_type" = "Standard_E16s_v3"
64+
"machine_type" = "Standard_D4ds_v5"
6565
"os_disk_size" = 200
6666
"min_nodes" = 1
6767
"max_nodes" = 1
@@ -73,21 +73,21 @@ node_pools = {
7373
}
7474
},
7575
stateless = {
76-
"machine_type" = "Standard_D16s_v3"
76+
"machine_type" = "Standard_D4s_v5"
7777
"os_disk_size" = 200
78-
"min_nodes" = 2
79-
"max_nodes" = 2
78+
"min_nodes" = 1
79+
"max_nodes" = 4
8080
"max_pods" = 110
8181
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
8282
"node_labels" = {
8383
"workload.sas.com/class" = "stateless"
8484
}
8585
},
8686
stateful = {
87-
"machine_type" = "Standard_D8s_v3"
87+
"machine_type" = "Standard_D4s_v5"
8888
"os_disk_size" = 200
89-
"min_nodes" = 3
90-
"max_nodes" = 3
89+
"min_nodes" = 1
90+
"max_nodes" = 2
9191
"max_pods" = 110
9292
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
9393
"node_labels" = {
@@ -107,6 +107,6 @@ create_nfs_public_ip = false
107107
nfs_vm_admin = "nfsuser"
108108
nfs_vm_zone = 1
109109

110-
nfs_raid_disk_size = 128
110+
nfs_raid_disk_size = 256
111111
nfs_raid_disk_type = "Standard_LRS"
112112
nfs_raid_disk_zone = "1"

0 commit comments

Comments
 (0)