Skip to content

Commit

Permalink
Merge pull request #133 from sassoftware/staging
Browse files Browse the repository at this point in the history
3.0.0 - April 28, 2022
  • Loading branch information
riragh authored Apr 28, 2022
2 parents 5f93194 + 9d9d6b4 commit f637a81
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 70 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN apt-get install -y jq \
&& chmod 755 ./kubectl /viya4-iac-gcp/docker-entrypoint.sh \
&& mv ./kubectl /usr/local/bin/kubectl \
&& chmod g=u -R /etc/passwd /etc/group /viya4-iac-gcp \
&& git config --system --add safe.directory /viya4-iac-gcp \
&& terraform init

ENV TF_VAR_iac_tooling=docker
Expand Down
14 changes: 0 additions & 14 deletions docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,20 +172,6 @@ compute = {
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 5
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
Expand Down
Binary file modified docs/images/viya4-iac-gcp-diag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions docs/sas-updates.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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).

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`.

If you are updating SAS Viya to version 2021.2.6, take some additional steps to remove the connect nodes.

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).
2. When the update to 2021.2.6 has completed successfully, use the `examples/sample-input.tfvars` file or edit your customized variable definition file (tfvars) to remove `connect={}` from the "node_pools" section.
3. Run `terraform apply` using your edited tfvars file.
14 changes: 0 additions & 14 deletions examples/sample-input-byo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,6 @@ node_pools = {
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 1
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
Expand Down
114 changes: 114 additions & 0 deletions examples/sample-input-connect.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# !NOTE! - These are only a subset of CONFIG-VARS.md provided for sample.
# Customize this file to add any variables from 'CONFIG-VARS.md' that you want
# to change their default values.

# **************** REQUIRED VARIABLES ****************
# These required variables' values MUST be provided by the User
prefix = "<prefix-value>"
location = "<gcp-zone-or-region>" # e.g., "us-east1-b"
project = "<gcp-project>"
service_account_keyfile = "<service-account-json-file>"
#
# **************** REQUIRED VARIABLES ****************

# **************** RECOMMENDED VARIABLES ****************
default_public_access_cidrs = [] # e.g., ["123.45.6.89/32"]
ssh_public_key = "~/.ssh/id_rsa.pub"
# **************** RECOMMENDED VARIABLES ****************

# add labels to the created resources
tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }

# Postgres config - By having this entry a database server is created. If you do not
# need an external database server remove the 'postgres_servers'
# block below.
postgres_servers = {
default = {},
}

# GKE config
kubernetes_version = "1.21.6-gke.1503"
default_nodepool_min_nodes = 2
default_nodepool_vm_type = "e2-standard-8"

# Node Pools config
node_pools = {
cas = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 1
"node_taints" = ["workload.sas.com/class=cas:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "cas"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
compute = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 1
"node_taints" = ["workload.sas.com/class=compute:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "compute"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 1
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 2
"node_taints" = ["workload.sas.com/class=stateless:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "stateless"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateful = {
"vm_type" = "e2-standard-8"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 3
"node_taints" = ["workload.sas.com/class=stateful:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "stateful"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
}
}

# Jump Box
create_jump_public_ip = true
jump_vm_admin = "jumpuser"

# Storage for SAS Viya CAS/Compute
storage_type = "standard"
# required ONLY when storage_type is "standard" to create NFS Server VM
create_nfs_public_ip = false
nfs_vm_admin = "nfsuser"
nfs_raid_disk_size = 128
14 changes: 0 additions & 14 deletions examples/sample-input-ha.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,6 @@ node_pools = {
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 2
"max_nodes" = 3
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
Expand Down
14 changes: 0 additions & 14 deletions examples/sample-input.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,6 @@ node_pools = {
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 1
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
Expand Down
14 changes: 0 additions & 14 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -229,20 +229,6 @@ variable "node_pools" {
"accelerator_count" = 0
"accelerator_type" = ""
},
connect = {
"vm_type" = "n1-highmem-16"
"os_disk_size" = 200
"min_nodes" = 1
"max_nodes" = 5
"node_taints" = ["workload.sas.com/class=connect:NoSchedule"]
"node_labels" = {
"workload.sas.com/class" = "connect"
"launcher.sas.com/prepullImage" = "sas-programming-environment"
}
"local_ssd_count" = 0
"accelerator_count" = 0
"accelerator_type" = ""
},
stateless = {
"vm_type" = "e2-standard-16"
"os_disk_size" = 200
Expand Down

0 comments on commit f637a81

Please sign in to comment.