Merge pull request #218 from sassoftware/staging

7.0.0 - June 28, 2024
sassoftware · Jun 28, 2024 · d26670e · d26670e
2 parents 5b06d9a + 3806305
commit d26670e
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 95 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-ARG TERRAFORM_VERSION=1.7.3
-ARG GCP_CLI_VERSION=472.0.0
+ARG TERRAFORM_VERSION=1.8.5
+ARG GCP_CLI_VERSION=479.0.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine

diff --git a/README.md b/README.md
@@ -31,10 +31,10 @@ Operational knowledge of
 
 - Terraform or Docker
   - #### Terraform
-    - [Terraform](https://www.terraform.io/downloads.html) - v1.7.3
+    - [Terraform](https://www.terraform.io/downloads.html) - v1.8.5
     - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.28.7
     - [jq](https://stedolan.github.io/jq/) - v1.6
-    - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v472.0.0
+    - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v479.0.0
     - [gke-gcloud-auth-plugin](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl#install_plugin) - (optional - only for provider based Kubernetes configuration files) - >= v1.26
   - #### Docker
     - [Docker](https://docs.docker.com/get-docker/)

diff --git a/config/sample-input-tf-enterprise.tfvars b/config/sample-input-tf-enterprise.tfvars
@@ -40,26 +40,26 @@ create_static_kubeconfig = true
 # GKE config
 kubernetes_version         = "1.28"
 default_nodepool_min_nodes = 1
-default_nodepool_vm_type   = "n2-standard-2"
+default_nodepool_vm_type   = "n2-highmem-8"
 
-## Cluster Node Pools config - mimimal
+## Cluster Node Pools config - minimal
 cluster_node_pool_mode = "minimal"
 node_pools = {
   cas = {
-    "vm_type"      = "n2-highmem-4"
+    "vm_type"      = "n2-highmem-16"
     "os_disk_size" = 200
     "min_nodes"    = 0
     "max_nodes"    = 5
     "node_taints"  = ["workload.sas.com/class=cas:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "cas"
     }
-    "local_ssd_count"   = 0
+    "local_ssd_count"   = 2
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   generic = {
-    "vm_type"      = "n2-standard-8"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 0
     "max_nodes"    = 5
@@ -84,8 +84,8 @@ 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_vm_type          = "n2-standard-4"
-nfs_raid_disk_size   = 128
+nfs_vm_type          = "n2-highmem-4"
+nfs_raid_disk_size   = 1000
 
 # Postgres config - By having this entry a database server is created. If you do not
 #                   need an external database server remove the 'postgres_servers'

diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
@@ -125,7 +125,7 @@ The application of a Kubernetes version in GCP has some limitations when assigni
 
 | Name | Description | Type | Default | Notes |
 | :--- | ---: | ---: | ---: | ---: |
-| default_nodepool_vm_type | Type of the default nodepool VMs | string | "e2-standard-8" | |
+| default_nodepool_vm_type | Type of the default nodepool VMs | string | "n2-highmem-8" | |
 | default_nodepool_os_disk_size | Disk size for default nodepool VMs in GB | number | 128 ||
 | default_nodepool_min_nodes | Minimum number of nodes for the default nodepool | number | 1 | |
 | default_nodepool_max_nodes | Maximum number of nodes for the default nodepool | number | 5 | |
@@ -153,20 +153,20 @@ The default values for the `node_pools` variable are:
 
 ```yaml
 cas = {
-  "vm_type"      = "n1-highmem-16"
+  "vm_type"      = "n2-highmem-16"
   "os_disk_size" = 200
   "min_nodes"    = 1
   "max_nodes"    = 5
   "node_taints"  = ["workload.sas.com/class=cas:NoSchedule"]
   "node_labels" = {
     "workload.sas.com/class" = "cas"
   }
-  "local_ssd_count"   = 0
+  "local_ssd_count"   = 2
   "accelerator_count" = 0
   "accelerator_type" = ""
 },
 compute = {
-  "vm_type"      = "n1-highmem-16"
+  "vm_type"      = "n2-highmem-4"
   "os_disk_size" = 200
   "min_nodes"    = 1
   "max_nodes"    = 5
@@ -175,12 +175,12 @@ compute = {
     "workload.sas.com/class"        = "compute"
     "launcher.sas.com/prepullImage" = "sas-programming-environment"
   }
-  "local_ssd_count"   = 0
+  "local_ssd_count"   = 1
   "accelerator_count" = 0
   "accelerator_type"  = ""
 },
 stateless = {
-  "vm_type"      = "e2-standard-16"
+  "vm_type"      = "n2-highmem-4"
   "os_disk_size" = 200
   "min_nodes"    = 1
   "max_nodes"    = 5
@@ -193,7 +193,7 @@ stateless = {
   "accelerator_type"  = ""
 },
 stateful = {
-  "vm_type"      = "e2-standard-8"
+  "vm_type"      = "n2-highmem-4"
   "os_disk_size" = 200
   "min_nodes"    = 1
   "max_nodes"    = 3
@@ -219,7 +219,7 @@ stateful = {
 | :--- | ---: | ---: | ---: | ---: |
 | create_nfs_public_ip | Add public ip to the NFS server VM | bool | false | The NFS server VM is only created when storage_type="standard" |
 | nfs_vm_admin | OS Admin User for the NFS server VM | string | "nfsuser" | The NFS server VM is only created when storage_type="standard" |
-| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 128 | The NFS server VM is only created when storage_type="standard" |
+| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 1000 | The NFS server VM is only created when storage_type="standard" |
 
 ### For `storage_type=ha` only (Google Filestore)
 
@@ -256,8 +256,8 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
 
 | Name | Description | Type | Default | Notes |
 | :--- | ---: | ---: | ---: | ---: |
-| machine_type| The machine type for the PostgreSQL server VMs" | string | "db-custom-8-30720" | Google Cloud Postgres supports only shared-core machine types such as db-f1-micro, and custom machine types such as db-custom-2-13312. |
-| storage_gb | Minimum storage allowed for the PostgreSQL server | number | 10 | |
+| machine_type| The machine type for the PostgreSQL server VMs" | string | "db-custom-4-16384" | Google Cloud Postgres supports only shared-core machine types such as db-f1-micro, and custom machine types such as db-custom-2-13312. |
+| storage_gb | Minimum storage allowed for the PostgreSQL server | number | 128 | |
 | backups_enabled | Enables postgres backups | bool | true | |
 | backups_start_time | Start time for postgres backups | string | "21:00" | |
 | backups_location | TODO | string | null | |
@@ -280,8 +280,8 @@ postgres_servers = {
     administrator_password       = "D0ntL00kTh1sWay"
   },
   cds-postgres = {
-    machine_type                           = "db-custom-8-30720"
-    storage_gb                             = 10
+    machine_type                           = "db-custom-4-16384"
+    storage_gb                             = 128
     backups_enabled                        = true
     backups_start_time                     = "21:00"
     backups_location                       = null

diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars
@@ -39,25 +39,25 @@ postgres_servers = {
 # GKE config
 kubernetes_version         = "1.28"
 default_nodepool_min_nodes = 2
-default_nodepool_vm_type   = "e2-standard-8"
+default_nodepool_vm_type   = "n2-highmem-8"
 
 # Node Pools config
 node_pools = {
   cas = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-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
+    "local_ssd_count"   = 2
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   compute = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
     "max_nodes"    = 1
@@ -66,15 +66,15 @@ node_pools = {
       "workload.sas.com/class"        = "compute"
       "launcher.sas.com/prepullImage" = "sas-programming-environment"
     }
-    "local_ssd_count"   = 0
+    "local_ssd_count"   = 1
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   stateless = {
-    "vm_type"      = "e2-standard-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
-    "max_nodes"    = 2
+    "max_nodes"    = 4
     "node_taints"  = ["workload.sas.com/class=stateless:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateless"
@@ -84,10 +84,10 @@ node_pools = {
     "accelerator_type"  = ""
   },
   stateful = {
-    "vm_type"      = "e2-standard-8"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
-    "max_nodes"    = 3
+    "max_nodes"    = 2
     "node_taints"  = ["workload.sas.com/class=stateful:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateful"
@@ -108,4 +108,4 @@ 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
+nfs_raid_disk_size   = 1000
diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars
@@ -29,25 +29,25 @@ postgres_servers = {
 # GKE config
 kubernetes_version         = "1.28"
 default_nodepool_min_nodes = 2
-default_nodepool_vm_type   = "e2-standard-8"
+default_nodepool_vm_type   = "n2-highmem-8"
 
 # Node Pools config
 node_pools = {
   cas = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-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
+    "local_ssd_count"   = 2
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   compute = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
     "max_nodes"    = 1
@@ -56,12 +56,12 @@ node_pools = {
       "workload.sas.com/class"        = "compute"
       "launcher.sas.com/prepullImage" = "sas-programming-environment"
     }
-    "local_ssd_count"   = 0
+    "local_ssd_count"   = 1
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   connect = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-highmem-16"
     "os_disk_size" = 200
     "min_nodes"    = 1
     "max_nodes"    = 1
@@ -75,10 +75,10 @@ node_pools = {
     "accelerator_type"  = ""
   },
   stateless = {
-    "vm_type"      = "e2-standard-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
-    "max_nodes"    = 2
+    "max_nodes"    = 4
     "node_taints"  = ["workload.sas.com/class=stateless:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateless"
@@ -88,10 +88,10 @@ node_pools = {
     "accelerator_type"  = ""
   },
   stateful = {
-    "vm_type"      = "e2-standard-8"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 1
-    "max_nodes"    = 3
+    "max_nodes"    = 2
     "node_taints"  = ["workload.sas.com/class=stateful:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateful"
@@ -111,4 +111,4 @@ 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
+nfs_raid_disk_size   = 1000
diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars
@@ -29,42 +29,42 @@ postgres_servers = {
 # GKE config
 kubernetes_version         = "1.28"
 default_nodepool_min_nodes = 2
-default_nodepool_vm_type   = "e2-standard-8"
+default_nodepool_vm_type   = "n2-highmem-8"
 
 # Node Pools config
 node_pools = {
   cas = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-highmem-16"
     "os_disk_size" = 200
     "min_nodes"    = 2
     "max_nodes"    = 3
     "node_taints"  = ["workload.sas.com/class=cas:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "cas"
     }
-    "local_ssd_count"   = 0
+    "local_ssd_count"   = 2
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   compute = {
-    "vm_type"      = "n1-highmem-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 2
     "max_nodes"    = 3
     "node_taints"  = ["workload.sas.com/class=compute:NoSchedule"]
     "node_labels" = {
-      "workload.sas.com/class"       = "compute"
-      "launcher.sas.comprepullImage" = "sas-programming-environment"
+      "workload.sas.com/class"        = "compute"
+      "launcher.sas.com/prepullImage" = "sas-programming-environment"
     }
-    "local_ssd_count"   = 0
+    "local_ssd_count"   = 1
     "accelerator_count" = 0
     "accelerator_type"  = ""
   },
   stateless = {
-    "vm_type"      = "e2-standard-16"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 2
-    "max_nodes"    = 3
+    "max_nodes"    = 4
     "node_taints"  = ["workload.sas.com/class=stateless:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateless"
@@ -74,10 +74,10 @@ node_pools = {
     "accelerator_type"  = ""
   },
   stateful = {
-    "vm_type"      = "e2-standard-8"
+    "vm_type"      = "n2-highmem-4"
     "os_disk_size" = 200
     "min_nodes"    = 2
-    "max_nodes"    = 3
+    "max_nodes"    = 4
     "node_taints"  = ["workload.sas.com/class=stateful:NoSchedule"]
     "node_labels" = {
       "workload.sas.com/class" = "stateful"