Skip to content

Commit 192b628

Browse files
authored
Merge pull request #267 from sassoftware/staging
6.0.0 - October 20, 2022
2 parents e54c0a9 + 70b7324 commit 192b628

28 files changed

+439
-275
lines changed

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ SAS Viya 4 in your cloud environment. To learn about all phases and options of t
2828
[Getting Started with SAS Viya and Azure Kubernetes Service](https://go.documentation.sas.com/doc/en/itopscdc/default/itopscon/n1d7qc4nfr3s5zn103a1qy0kj4l1.htm) in _SAS Viya Operations_.
2929

3030

31+
This project follows the [SemVer](https://semver.org/#summary) versioning scheme. Given a version number MAJOR.MINOR.PATCH, we increment the:
32+
33+
>- MAJOR version when we make changes that are incompatible with the functionality of a previous component
34+
>- MINOR version when we add functionality that is backwards-compatible
35+
>- PATCH version when we make bug fixes that are backwards-compatible
36+
37+
**Note**: You must take down your existing infrastructure and rebuild it when you are upgrading to a new major version because of potential backward incompatibility. For details about the changes that are added in each release, see the Release Notes.
38+
3139
## Prerequisites
3240

3341
Use of these tools requires operational knowledge of the following technologies:
@@ -128,4 +136,4 @@ Additional configuration to harden your cluster environment is supported and enc
128136
### Terraform Resources
129137

130138
- [Azure Provider](https://www.terraform.io/docs/providers/azurerm/index.html)
131-
- [Azure AKS](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster.html)
139+
- [Azure AKS](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster)

TODO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Changes for SAS locked down
66
- make var for setting outbound_type. Needing for locked down accounts where creating routing tables is not permitted
7-
- make var for postgres vnet_rules. for vpn subscriptions
7+
- add Private access (VNet Integration) for flexible postgres
88

99
## Update docs
1010
- Add this line back into CONFIG-VARS.md @ 122

docs/CONFIG-VARS.md

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ You can use `default_public_access_cidrs` to set a default range for all created
7272
| default_public_access_cidrs | IP address ranges allowed to access all created cloud resources | list of strings | | Sets a default for all resources. |
7373
| cluster_endpoint_public_access_cidrs | IP address ranges allowed to access the AKS cluster API | list of strings | | For client admin access to the cluster api (by `kubectl`, for example). Only used with `cluster_api_mode=public`|
7474
| vm_public_access_cidrs | IP address ranges allowed to access the VMs | list of strings | | Opens port 22 for SSH access to the jump server and/or NFS VM by adding Ingress Rule on the NSG. Only used with `create_jump_public_ip=true` or `create_nfs_public_ip=true` |
75-
| postgres_public_access_cidrs | IP address ranges allowed to access the Azure PostgreSQL Server | list of strings || Opens port 5432 by adding Ingress Rule on the NSG. Only used when creating postgres instances. |
75+
| postgres_public_access_cidrs | IP address ranges allowed to access the Azure PostgreSQL Flexible Server | list of strings || Opens port 5432 by adding Ingress Rule on the NSG. Only used when creating postgres instances. |
7676
| acr_public_access_cidrs | IP address ranges allowed to access the ACR instance | list of strings || Only used with `create_container_registry=true` |
7777

7878
**NOTE:** In a SCIM environment, the AzureActiveDirectory service tag must be granted access to port 443/HTTPS for the Ingress IP address.
@@ -93,23 +93,23 @@ The default values for the `subnets` variable are as follows:
9393
aks = {
9494
"prefixes": ["192.168.0.0/23"],
9595
"service_endpoints": ["Microsoft.Sql"],
96-
"enforce_private_link_endpoint_network_policies": false,
97-
"enforce_private_link_service_network_policies": false,
96+
"private_endpoint_network_policies_enabled": false,
97+
"private_link_service_network_policies_enabled": false,
9898
"service_delegations": {},
9999
}
100100
misc = {
101101
"prefixes": ["192.168.2.0/24"],
102102
"service_endpoints": ["Microsoft.Sql"],
103-
"enforce_private_link_endpoint_network_policies": false,
104-
"enforce_private_link_service_network_policies": false,
103+
"private_endpoint_network_policies_enabled": false,
104+
"private_link_service_network_policies_enabled": false,
105105
"service_delegations": {},
106106
}
107107
## If using ha storage then the following is also added
108108
netapp = {
109109
"prefixes": ["192.168.3.0/24"],
110110
"service_endpoints": [],
111-
"enforce_private_link_endpoint_network_policies": false,
112-
"enforce_private_link_service_network_policies": false,
111+
"private_endpoint_network_policies_enabled": false,
112+
"private_link_service_network_policies_enabled": false,
113113
"service_delegations": {
114114
netapp = {
115115
"name" : "Microsoft.Netapp/volumes"
@@ -281,9 +281,9 @@ When `storage_type=standard`, a NFS Server VM is created, only when these variab
281281
| nfs_vm_admin | OS Admin User for the NFS server VM | string | "nfsuser" | |
282282
| 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`|
283283
| nfs_vm_zone | Zone in which NFS server VM should be created | string | null | |
284-
| 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_zones` 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. |
284+
| 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. |
285285
| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 128 | |
286-
| nfs_raid_disk_zones | A collection containing the availability zones to allocate the Managed Disks for NFS | list of strings | [] | |
286+
| 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 | |
287287

288288
### Azure NetApp Files (only when `storage_type=ha`)
289289

@@ -295,6 +295,7 @@ When `storage_type=ha` (high availability), [Microsoft Azure NetApp Files](https
295295
| netapp_size_in_tb | Provisioned size of the pool in TB. Value must be between 4 and 500 | number | 4 | |
296296
| netapp_protocols | The target volume protocol expressed as a list. Supported single value include CIFS, NFSv3, or NFSv4.1. If argument is not defined, it defaults to NFSv3. Changing this forces a new resource to be created and data will be lost. | list of strings | ["NFSv3"] | |
297297
| netapp_volume_path |A unique file path for the volume. Used when creating mount targets. Changing this forces a new resource to be created. | string | "export" | |
298+
| netapp_network_features |Indicates which network feature to use, accepted values are `Basic` or `Standard`, it defaults to `Basic` if not defined. | string | "Basic" | This is a feature in public preview. For more information about it and how to register, please refer to [Configure network features for an Azure NetApp Files volume](https://docs.microsoft.com/en-us/azure/azure-netapp-files/configure-network-features)|
298299

299300
## Azure Container Registry (ACR)
300301

@@ -326,15 +327,15 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
326327

327328
| Name | Description | Type | Default | Notes |
328329
| :--- | ---: | ---: | ---: | ---: |
329-
| sku_name| The SKU Name for the PostgreSQL Server | string | "GP_Gen5_32" | The name pattern is the SKU, followed by the tier + family + cores (e.g. B_Gen4_1, GP_Gen5_4).|
330-
| storage_mb | Max storage allowed for the PostgreSQL server | number | 51200 | Possible values are between 5120 MB(5GB) and 1048576 MB(1TB) for the Basic SKU and between 5120 MB(5GB) and 4194304 MB(4TB) for General Purpose/Memory Optimized SKUs |
331-
| backup_retention_days | Backup retention days for the PostgreSQL server | number | 7 | Supported values are between 7 and 35 days. |
330+
| 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).|
331+
| storage_mb | The max storage allowed for the PostgreSQL Flexible Server | number | 51200 | Possible values are 32768, 65536, 131072, 262144, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, and 33554432. |
332+
| backup_retention_days | Backup retention days for the PostgreSQL Flexible server | number | 7 | Supported values are between 7 and 35 days. |
332333
| geo_redundant_backup_enabled | Enable Geo-redundant or not for server backup | bool | false | Not supported for the basic tier. |
333-
| administrator_login | The Administrator Login for the PostgreSQL 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/quickstart-create-server-database-portal) |
334-
| administrator_password | The Password associated with the administrator_login for the PostgreSQL Server | string | "my$up3rS3cretPassw0rd" | The password must contain between 8 and 128 characters and must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers (0 through 9), and non-alphanumeric characters (!, $, #, %, etc.). |
335-
| server_version | The version of the Azure Database for PostgreSQL server instance. Changing this forces a new resource to be created.| string | "11" | |
336-
| ssl_enforcement_enabled | Enforce SSL on connection to the Azure Database for PostgreSQL server instance | bool | true | |
337-
| postgresql_configurations | Configurations to enable on the PostgreSQL Database server instance | map(string) | {} | More details can be found [here](https://docs.microsoft.com/en-us/azure/postgresql/howto-configure-server-parameters-using-cli) |
334+
| 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) |
335+
| administrator_password | The Password associated with the administrator_login for the PostgreSQL Flexible Server | string | "my$up3rS3cretPassw0rd" | The password must contain between 8 and 128 characters and must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers (0 through 9), and non-alphanumeric characters (!, $, #, %, etc.). |
336+
| server_version | The version of the PostgreSQL Flexible server instance | string | "13" | Refer to the [Viya 4 Administration Guide](https://go.documentation.sas.com/doc/en/sasadmincdc/default/itopssr/p05lfgkwib3zxbn1t6nyihexp12n.htm?fromDefault=#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for SAS Viya. |
337+
| ssl_enforcement_enabled | Enforce SSL on connection to the Azure Database for PostgreSQL Flexible server instance | bool | true | |
338+
| postgresql_configurations | Sets a PostgreSQL Configuration value on a Azure PostgreSQL Flexible Server | list(object) | [] | More details can be found [here](https://docs.microsoft.com/en-us/azure/postgresql/flexible-server/howto-configure-server-parameters-using-cli) |
338339

339340
Here is a sample of the `postgres_servers` variable with the `default` entry only overriding the `administrator_password` parameter and the `cps` entry overriding all of the parameters:
340341

@@ -344,15 +345,20 @@ postgres_servers = {
344345
administrator_password = "D0ntL00kTh1sWay"
345346
},
346347
another_server = {
347-
sku_name = "GP_Gen5_32"
348-
storage_mb = 51200
348+
sku_name = "GP_Standard_D16s_v3"
349+
storage_mb = 65536
349350
backup_retention_days = 7
350351
geo_redundant_backup_enabled = false
351352
administrator_login = "pgadmin"
352353
administrator_password = "1tsAB3aut1fulDay"
353-
server_version = "11"
354+
server_version = "13"
354355
ssl_enforcement_enabled = true
355-
postgresql_configurations = { foo = "true", bar = "false" }
356+
postgresql_configurations = [
357+
{
358+
name = "azure.extensions"
359+
value = "PLPGSQL,LTREE"
360+
}
361+
]
356362
}
357363
}
358364
```

examples/sample-input-byo.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,3 @@ nfs_vm_admin = "nfsuser"
111111
nfs_vm_machine_type = "Standard_D8s_v4"
112112
nfs_raid_disk_size = 128
113113
nfs_raid_disk_type = "Standard_LRS"
114-
115-
# Azure Monitor
116-
create_aks_azure_monitor = false

examples/sample-input-connect.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,3 @@ nfs_vm_admin = "nfsuser"
112112
nfs_vm_machine_type = "Standard_D8s_v4"
113113
nfs_raid_disk_size = 128
114114
nfs_raid_disk_type = "Standard_LRS"
115-
116-
# Azure Monitor
117-
create_aks_azure_monitor = false

examples/sample-input-ha.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,3 @@ storage_type = "ha"
9797
# required ONLY when storage_type = ha for Azure NetApp Files service
9898
netapp_service_level = "Premium"
9999
netapp_size_in_tb = 4
100-
101-
# Azure Monitor
102-
create_aks_azure_monitor = false

examples/sample-input-minimal.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,3 @@ nfs_vm_admin = "nfsuser"
7878
nfs_vm_machine_type = "Standard_D4s_v4"
7979
nfs_raid_disk_size = 128
8080
nfs_raid_disk_type = "Standard_LRS"
81-
82-
# Azure Monitor
83-
create_aks_azure_monitor = false

examples/sample-input-ppg.tfvars

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,4 @@ nfs_vm_zone = 1
108108

109109
nfs_raid_disk_size = 128
110110
nfs_raid_disk_type = "Standard_LRS"
111-
nfs_raid_disk_zones = ["1"]
112-
113-
# Azure Monitor
114-
create_aks_azure_monitor = false
111+
nfs_raid_disk_zone = "1"

examples/sample-input-singlestore.tfvars

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ nfs_vm_machine_type = "Standard_D8s_v4"
113113
nfs_raid_disk_size = 128
114114
nfs_raid_disk_type = "Standard_LRS"
115115

116-
# Azure Monitor
117-
create_aks_azure_monitor = false
118-
119116
# SingleStore configuration
120117
aks_network_plugin = "azure"
121118

@@ -124,23 +121,23 @@ subnets = {
124121
aks = {
125122
"prefixes": ["192.168.0.0/21"],
126123
"service_endpoints": ["Microsoft.Sql"],
127-
"enforce_private_link_endpoint_network_policies": false,
128-
"enforce_private_link_service_network_policies": false,
124+
"private_endpoint_network_policies_enabled": false,
125+
"private_link_service_network_policies_enabled": false,
129126
"service_delegations": {},
130127
}
131128
misc = {
132129
"prefixes": ["192.168.8.0/24"],
133130
"service_endpoints": ["Microsoft.Sql"],
134-
"enforce_private_link_endpoint_network_policies": false,
135-
"enforce_private_link_service_network_policies": false,
131+
"private_endpoint_network_policies_enabled": false,
132+
"private_link_service_network_policies_enabled": false,
136133
"service_delegations": {},
137134
}
138135
## If using ha storage then the following is also added
139136
netapp = {
140137
"prefixes": ["192.168.9.0/24"],
141138
"service_endpoints": [],
142-
"enforce_private_link_endpoint_network_policies": false,
143-
"enforce_private_link_service_network_policies": false,
139+
"private_endpoint_network_policies_enabled": false,
140+
"private_link_service_network_policies_enabled": false,
144141
"service_delegations": {
145142
netapp = {
146143
"name" : "Microsoft.Netapp/volumes"

examples/sample-input.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,3 @@ nfs_vm_admin = "nfsuser"
100100
nfs_vm_machine_type = "Standard_D8s_v4"
101101
nfs_raid_disk_size = 128
102102
nfs_raid_disk_type = "Standard_LRS"
103-
104-
# Azure Monitor
105-
create_aks_azure_monitor = false

0 commit comments

Comments
 (0)