Merge pull request #254 from sassoftware/staging

PhanikumarThodupunoori · web-flow · commit aaf6ef8abfb2 · 2025-04-16T13:21:14.000-05:00
7.4.0 - April 16, 2025
diff --git a/.github/workflows/linter-analysis.yaml b/.github/workflows/linter-analysis.yaml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Hadolint Action
-        uses: jbergstroem/hadolint-gh-action@v1.11.0
+        uses: jbergstroem/hadolint-gh-action@v1.12.2
         with:
           dockerfile: ./Dockerfile
           config_file: linting-configs/.hadolint.yaml
@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Cache Plugin Directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.tflint.d/plugins
           key: ubuntu-latest-tflint-${{ hashFiles('.tflint.hcl') }}
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ ARG GCP_CLI_VERSION=513.0.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION AS terraform
 FROM google/cloud-sdk:$GCP_CLI_VERSION-alpine
-ARG KUBECTL_VERSION=1.30.10
+ARG KUBECTL_VERSION=1.31.7
 ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True
 ARG INSTALL_COMPONENTS=""
 
diff --git a/README.md b/README.md
@@ -1,5 +1,24 @@
 # SAS Viya 4 Infrastructure as Code (IaC) for Google Cloud
 
+## Table of Contents
+
+- [Overview](#overview)
+- [Prerequisites](#prerequisites)
+  - [Required](#required)
+    - [Terraform](#terraform)
+    - [Docker](#docker)
+- [Getting Started](#getting-started)
+  - [Clone this project](#clone-this-project)
+  - [Authenticating Terraform to access Google Cloud](#authenticating-terraform-to-access-google-cloud)
+  - [Customize Input Values](#customize-input-values)
+- [Creating and Managing the Cloud Resources](#creating-and-managing-the-cloud-resources)
+- [Troubleshooting](#troubleshooting)
+- [Contributing](#contributing)
+- [License](#license)
+- [Additional Resources](#additional-resources)
+  - [Google Cloud](#google-cloud)
+  - [Terraform](#terraform-1)
+
 ## Overview
 
 This project contains Terraform scripts to provision Google Cloud infrastructure resources required to deploy SAS Viya 4 platform products. Here is a list of resources this project can create -
@@ -32,7 +51,7 @@ Operational knowledge of
 - Terraform or Docker
   - #### Terraform
     - [Terraform](https://www.terraform.io/downloads.html) - v1.10.5
-    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.10
+    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.31.7
     - [jq](https://stedolan.github.io/jq/) - v1.7
     - [gcloud CLI](https://cloud.google.com/sdk/gcloud) - (optional - useful as an alternative to the Google Cloud Platform Portal) - v513.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
diff --git a/config/sample-input-tf-enterprise.tfvars b/config/sample-input-tf-enterprise.tfvars
@@ -38,7 +38,7 @@ create_static_kubeconfig = true
 # tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 1
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
@@ -309,7 +309,7 @@ postgres_servers = {
     server_version                         = "15"
     availability_type                      = "ZONAL"
     ssl_enforcement_enabled                = true
-    database_flags                         = [{ name = "foo" value = "true"}, { name = "bar", value = "false"}]
+    database_flags                         = [{ name = "cloudsql.enable_pg_cron", value = "true"}, { name = "cloudsql.enable_pgaudit", value = "true"}]
   }
 }
 ```
diff --git a/examples/sample-input-byo.tfvars b/examples/sample-input-byo.tfvars
@@ -37,7 +37,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/examples/sample-input-connect.tfvars b/examples/sample-input-connect.tfvars
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/examples/sample-input-ha.tfvars b/examples/sample-input-ha.tfvars
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/examples/sample-input-minimal.tfvars b/examples/sample-input-minimal.tfvars
@@ -27,7 +27,7 @@ tags = {} # e.g., { "key1" = "value1", "key2" = "value2" }
 # }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 1
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/examples/sample-input.tfvars b/examples/sample-input.tfvars
@@ -27,7 +27,7 @@ postgres_servers = {
 }
 
 # GKE config
-kubernetes_version         = "1.30"
+kubernetes_version         = "1.31"
 default_nodepool_min_nodes = 2
 default_nodepool_vm_type   = "n2-highmem-8"
 
diff --git a/main.tf b/main.tf
@@ -91,7 +91,7 @@ data "google_container_engine_versions" "gke-version" {
 
 module "gke" {
   source                        = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
-  version                       = "~> 33.1.0"
+  version                       = "~> 36.2.0"
   project_id                    = var.project
   name                          = "${var.prefix}-gke"
   region                        = local.region
@@ -241,7 +241,7 @@ resource "local_file" "kubeconfig" {
 # Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/12.0.0/submodules/postgresql
 module "postgresql" {
   source     = "GoogleCloudPlatform/sql-db/google//modules/postgresql"
-  version    = "~> 22.1.0"
+  version    = "~> 25.2.2"
   project_id = var.project
 
   for_each = local.postgres_servers != null ? length(local.postgres_servers) != 0 ? local.postgres_servers : {} : {}
diff --git a/versions.tf b/versions.tf
@@ -7,11 +7,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "6.24.0"
+      version = "6.28.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "6.24.0"
+      version = "6.28.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ postgres_servers = {`
`309`	`309`	`server_version = "15"`
`310`	`310`	`availability_type = "ZONAL"`
`311`	`311`	`ssl_enforcement_enabled = true`
`312`		`- database_flags = [{ name = "foo" value = "true"}, { name = "bar", value = "false"}]`
	`312`	`+ database_flags = [{ name = "cloudsql.enable_pg_cron", value = "true"}, { name = "cloudsql.enable_pgaudit", value = "true"}]`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`	```
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ postgres_servers = {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`# GKE config`
`40`		`-kubernetes_version = "1.30"`
	`40`	`+kubernetes_version = "1.31"`
`41`	`41`	`default_nodepool_min_nodes = 2`
`42`	`42`	`default_nodepool_vm_type = "n2-highmem-8"`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ postgres_servers = {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`# GKE config`
`30`		`-kubernetes_version = "1.30"`
	`30`	`+kubernetes_version = "1.31"`
`31`	`31`	`default_nodepool_min_nodes = 2`
`32`	`32`	`default_nodepool_vm_type = "n2-highmem-8"`
`33`	`33`