Merge pull request #193 from sassoftware/staging

5.4.0 - August 18, 2023

Dockerfile

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG TERRAFORM_VERSION=1.4.5
-ARG GCP_CLI_VERSION=428.0.0
+ARG GCP_CLI_VERSION=440.0.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine
-ARG KUBECTL_VERSION=1.25.8
+ARG KUBECTL_VERSION=1.26.7
 ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True
 ARG INSTALL_COMPONENTS=""
 

README.md

@@ -32,9 +32,9 @@ Operational knowledge of
 - Terraform or Docker
   - #### Terraform
     - [Terraform](https://www.terraform.io/downloads.html) - v1.4.5
-    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.25.8
+    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.26.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) - v428.0.0
+    - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v440.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/)

config/sample-input-tf-enterprise.tfvars

@@ -12,7 +12,7 @@
 #       variable.
 # prefix         = "<prefix-value>"
 # location       = "<gcp-zone-or-region>" # e.g., "us-east1-b"
-# project        = "<gcp-project>"
+# project        = "<gcp-project-id>"
 # ssh_public_key = "<ssh-public-key>"
 # ****************  REQUIRED VARIABLES  ****************
 
@@ -38,7 +38,7 @@ create_static_kubeconfig = true
 # tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 1
 default_nodepool_vm_type   = "n2-standard-2"
 

docs/CONFIG-VARS.md

@@ -33,7 +33,7 @@ Terraform input variables can be set in the following ways:
 | :--- | :--- | :--- | :--- | :--- |
 | prefix | A prefix used in the name of all the GCP resources created by this script. | string | | The prefix string must start with a lowercase letter and contain only lowercase alphanumeric characters and dashes (-), but cannot end with a dash. |
 | location | The GCP Region (for example "us-east1") or GCP Zone (for example "us-east1-b") to provision all resources in this script. | string | | See [this topic](user/Locations.md) on how to chose a region or a zone.  |
-| project | The GCP Project to use | string | | |
+| project | The ID of the GCP Project to use | string | | |
 | service_account_keyfile | Filename of the Service Account JSON file | string | Not required when running on a Google Cloud VM that is associated with the Service Account |
 
 ## GCP Authentication

examples/sample-input-byo.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************
@@ -37,7 +37,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "e2-standard-8"
 

examples/sample-input-connect.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "e2-standard-8"
 

examples/sample-input-defaults.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************

examples/sample-input-ha.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "e2-standard-8"
 

examples/sample-input-minimal.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************
@@ -27,7 +27,7 @@ tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }
 # }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 1
 default_nodepool_vm_type   = "n2-standard-2"
 

examples/sample-input.tfvars

@@ -6,7 +6,7 @@
 # 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>"
+project                 = "<gcp-project-id>"
 service_account_keyfile = "<service-account-json-file>"
 #
 # ****************  REQUIRED VARIABLES  ****************
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.25"
+kubernetes_version         = "1.26"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "e2-standard-8"
 

files/cloud-init/jump/cloud-config

@@ -31,10 +31,16 @@ runcmd:
       # mount the nfs
       #
   -   while [ `df -h | grep "${rwx_filestore_endpoint}:${rwx_filestore_path}" | wc -l` -eq 0 ]; do sleep 5 && mount -a ; done
-      #
-      # Change permissions and owner
-      #
-  -   mkdir -p ${jump_rwx_filestore_path}/pvs
-  -   $(chmod -fR 777 ${jump_rwx_filestore_path} ; echo)
-  -   $(chown -R nobody:nogroup ${jump_rwx_filestore_path} ; echo)
+      # Create pvs folder and adjust perms and owner only if the folder doesn't exist
+      # On subsequent jump server creation if the mounted NFS already contains a "pvs" directory
+      # don't overwrite ownerships and permissions set by SAS Viya
+  -   if ! [ -d "${jump_rwx_filestore_path}/pvs" ]
+  -   then
+        #
+        # Change permissions and owner
+        #
+  -     mkdir -p ${jump_rwx_filestore_path}/pvs
+  -     $(chmod -fR 777 ${jump_rwx_filestore_path} ; echo)
+  -     $(chown -R nobody:nogroup ${jump_rwx_filestore_path} ; echo)
+  -   fi
   - fi

variables.tf

@@ -33,7 +33,7 @@ variable "service_account_keyfile" {
 }
 
 variable "project" {
-  description = "The GCP Project to use"
+  description = "The ID of the GCP Project to use"
   type        = string
 }