Skip to content

Commit a5b9638

Browse files
riraghriragh
authored
Merge pull request #235 from sassoftware/staging
5.0.0 - April 28, 2022
2 parents 6193b95 + 474c231 commit a5b9638

10 files changed

+128
-72
lines changed

‎Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apk --update --no-cache add git openssh \
1515
&& chmod 755 ./kubectl /viya4-iac-azure/docker-entrypoint.sh \
1616
&& mv ./kubectl /usr/local/bin/kubectl \
1717
&& chmod g=u -R /etc/passwd /etc/group /viya4-iac-azure \
18+
&& git config --system --add safe.directory /viya4-iac-azure \
1819
&& terraform init
1920

2021
ENV TF_VAR_iac_tooling=docker

‎docs/CONFIG-VARS.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,18 +229,6 @@ The default values for the `node_pools` variable are as follows:
229229
"launcher.sas.com/prepullImage" = "sas-programming-environment"
230230
}
231231
},
232-
connect = {
233-
"machine_type" = "Standard_E16s_v3"
234-
"os_disk_size" = 200
235-
"min_nodes" = 0
236-
"max_nodes" = 5
237-
"max_pods" = 110
238-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
239-
"node_labels" = {
240-
"workload.sas.com/class" = "connect"
241-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
242-
}
243-
},
244232
stateless = {
245233
"machine_type" = "Standard_D16s_v3"
246234
"os_disk_size" = 200

‎docs/images/viya4-iac-azure-diag.png

16.3 KB
Loading

‎docs/sas-updates.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
New in SAS Viya 2021.2.6: the connect workload class is no longer required. For more information, see [Connect Workload Class Changes](https://go.documentation.sas.com/doc/en/itopscdc/v_026/itopswn/n0jh2fbifqgoksn1uou9p2zgbzdy.htm#p15778dvqwzjtgn1e95nq9v0y1wv).
2+
3+
To deploy SAS Viya 2021.2.6 and later, use the most recent version of SAS Viya 4 Infrastructure as Code. The default settings do not create a connect node pool. If your current software order has a requirement for the connect node pool, you can use the connect node pool example file in `examples/sample-input-connect.tfvars`.
4+
5+
If you are updating SAS Viya to version 2021.2.6, take some additional steps to remove the connect nodes.
6+
7+
1. Perform the update by following the steps in the [SAS Viya documentation](https://go.documentation.sas.com/doc/en/itopscdc/default/k8sag/p043aa4ghwwom6n1beyfifdgkve7.htm).
8+
2. When the update to 2021.2.6 has completed successfully, use the `examples/sample-input.tfvars` or edit your customized variable definition file (tfvars) to remove `connect={}` from the "node_pools" section.
9+
3. Run `terraform apply` using your edited tfvars file.
10+

‎examples/sample-input-byo.tfvars

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,6 @@ node_pools = {
7474
"launcher.sas.com/prepullImage" = "sas-programming-environment"
7575
}
7676
},
77-
connect = {
78-
"machine_type" = "Standard_E16s_v3"
79-
"os_disk_size" = 200
80-
"min_nodes" = 1
81-
"max_nodes" = 1
82-
"max_pods" = 110
83-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
84-
"node_labels" = {
85-
"workload.sas.com/class" = "connect"
86-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
87-
}
88-
},
8977
stateless = {
9078
"machine_type" = "Standard_D16s_v3"
9179
"os_disk_size" = 200

‎examples/sample-input-connect.tfvars

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# !NOTE! - These are only a subset of CONFIG-VARS.md provided as examples.
2+
# Customize this file to add any variables from 'CONFIG-VARS.md' whose default values you
3+
# want to change.
4+
5+
# **************** REQUIRED VARIABLES ****************
6+
# These required variables' values MUST be provided by the User
7+
prefix = "<prefix-value>" # this is a prefix that you assign for the resources to be created
8+
location = "<azure-location-value>" # e.g., "eastus2"
9+
# **************** REQUIRED VARIABLES ****************
10+
11+
# !NOTE! - Without specifying your CIDR block access rules, ingress traffic
12+
# to your cluster will be blocked by default. In a SCIM environment,
13+
# the AzureActiveDirectory service tag must be granted access to port
14+
# 443/HTTPS for the ingress IP address.
15+
16+
# ************** RECOMMENDED VARIABLES ***************
17+
default_public_access_cidrs = [] # e.g., ["123.45.6.89/32"]
18+
ssh_public_key = "~/.ssh/id_rsa.pub"
19+
# ************** RECOMMENDED VARIABLES ***************
20+
21+
# Tags can be specified matching your tagging strategy.
22+
tags = {} # for example: { "owner|email" = "<you>@<domain>.<com>", "key1" = "value1", "key2" = "value2" }
23+
24+
# Postgres config - By having this entry a database server is created. If you do not
25+
# need an external database server remove the 'postgres_servers'
26+
# block below.
27+
postgres_servers = {
28+
default = {},
29+
}
30+
31+
# Azure Container Registry config
32+
create_container_registry = false
33+
container_registry_sku = "Standard"
34+
container_registry_admin_enabled = false
35+
36+
# AKS config
37+
kubernetes_version = "1.21.7"
38+
default_nodepool_min_nodes = 2
39+
default_nodepool_vm_type = "Standard_D8s_v4"
40+
41+
# AKS Node Pools config
42+
node_pools = {
43+
cas = {
44+
"machine_type" = "Standard_E16s_v3"
45+
"os_disk_size" = 200
46+
"min_nodes" = 1
47+
"max_nodes" = 1
48+
"max_pods" = 110
49+
"node_taints" = ["workload.sas.com/class=cas:NoSchedule"]
50+
"node_labels" = {
51+
"workload.sas.com/class" = "cas"
52+
}
53+
},
54+
compute = {
55+
"machine_type" = "Standard_E16s_v3"
56+
"os_disk_size" = 200
57+
"min_nodes" = 1
58+
"max_nodes" = 1
59+
"max_pods" = 110
60+
"node_taints" = ["workload.sas.com/class=compute:NoSchedule"]
61+
"node_labels" = {
62+
"workload.sas.com/class" = "compute"
63+
"launcher.sas.com/prepullImage" = "sas-programming-environment"
64+
}
65+
},
66+
connect = {
67+
"machine_type" = "Standard_E16s_v3"
68+
"os_disk_size" = 200
69+
"min_nodes" = 1
70+
"max_nodes" = 1
71+
"max_pods" = 110
72+
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
73+
"node_labels" = {
74+
"workload.sas.com/class" = "connect"
75+
"launcher.sas.com/prepullImage" = "sas-programming-environment"
76+
}
77+
},
78+
stateless = {
79+
"machine_type" = "Standard_D16s_v3"
80+
"os_disk_size" = 200
81+
"min_nodes" = 1
82+
"max_nodes" = 2
83+
"max_pods" = 110
84+
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
85+
"node_labels" = {
86+
"workload.sas.com/class" = "stateless"
87+
}
88+
},
89+
stateful = {
90+
"machine_type" = "Standard_D8s_v3"
91+
"os_disk_size" = 200
92+
"min_nodes" = 1
93+
"max_nodes" = 3
94+
"max_pods" = 110
95+
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
96+
"node_labels" = {
97+
"workload.sas.com/class" = "stateful"
98+
}
99+
}
100+
}
101+
102+
# Jump Server
103+
create_jump_public_ip = true
104+
jump_vm_admin = "jumpuser"
105+
jump_vm_machine_type = "Standard_B2s"
106+
107+
# Storage for SAS Viya CAS/Compute
108+
storage_type = "standard"
109+
# required ONLY when storage_type is "standard" to create NFS Server VM
110+
create_nfs_public_ip = false
111+
nfs_vm_admin = "nfsuser"
112+
nfs_vm_machine_type = "Standard_D8s_v4"
113+
nfs_raid_disk_size = 128
114+
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 & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@ node_pools = {
6161
"launcher.sas.com/prepullImage" = "sas-programming-environment"
6262
}
6363
},
64-
connect = {
65-
"machine_type" = "Standard_E16s_v3"
66-
"os_disk_size" = 200
67-
"min_nodes" = 2
68-
"max_nodes" = 3
69-
"max_pods" = 110
70-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
71-
"node_labels" = {
72-
"workload.sas.com/class" = "connect"
73-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
74-
}
75-
},
7664
stateless = {
7765
"machine_type" = "Standard_D16s_v3"
7866
"os_disk_size" = 200

‎examples/sample-input-ppg.tfvars

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@ node_pools = {
7171
"launcher.sas.com/prepullImage" = "sas-programming-environment"
7272
}
7373
},
74-
connect = {
75-
"machine_type" = "Standard_E16s_v3"
76-
"os_disk_size" = 200
77-
"min_nodes" = 1
78-
"max_nodes" = 1
79-
"max_pods" = 110
80-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
81-
"node_labels" = {
82-
"workload.sas.com/class" = "connect"
83-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
84-
}
85-
},
8674
stateless = {
8775
"machine_type" = "Standard_D16s_v3"
8876
"os_disk_size" = 200

‎examples/sample-input.tfvars

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@ node_pools = {
6363
"launcher.sas.com/prepullImage" = "sas-programming-environment"
6464
}
6565
},
66-
connect = {
67-
"machine_type" = "Standard_E16s_v3"
68-
"os_disk_size" = 200
69-
"min_nodes" = 1
70-
"max_nodes" = 1
71-
"max_pods" = 110
72-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
73-
"node_labels" = {
74-
"workload.sas.com/class" = "connect"
75-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
76-
}
77-
},
7866
stateless = {
7967
"machine_type" = "Standard_D16s_v3"
8068
"os_disk_size" = 200

‎variables.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -398,18 +398,6 @@ variable node_pools {
398398
"launcher.sas.com/prepullImage" = "sas-programming-environment"
399399
}
400400
},
401-
connect = {
402-
"machine_type" = "Standard_E16s_v3"
403-
"os_disk_size" = 200
404-
"min_nodes" = 0
405-
"max_nodes" = 5
406-
"max_pods" = 110
407-
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
408-
"node_labels" = {
409-
"workload.sas.com/class" = "connect"
410-
"launcher.sas.com/prepullImage" = "sas-programming-environment"
411-
}
412-
},
413401
stateless = {
414402
"machine_type" = "Standard_D16s_v3"
415403
"os_disk_size" = 200

0 commit comments

Comments
 (0)