Merge pull request #234 from sassoftware/staging

7.3.0 - March 19, 2025

Author: PhanikumarThodupunoori

.github/workflows/linter-analysis.yaml

@@ -1,7 +1,7 @@
 name: Linter Analysis
 on:
   push:
-    branches: [ '**' ] # '**' will cause the workflow to run on all commits to all branches, including those with path separators
+    branches: ['**']  # '**' will cause the workflow to run on all commits to all branches.
 
 jobs:
   # Hadolint: Job-1
@@ -32,7 +32,7 @@ jobs:
         with:
           severity: error
 
-  # TFLint: Job-3
+  # TFLint: Job-3 (For GCP)
   TFLint:
     name: TFLint
     runs-on: ubuntu-latest
@@ -46,6 +46,12 @@ jobs:
           path: ~/.tflint.d/plugins
           key: ubuntu-latest-tflint-${{ hashFiles('.tflint.hcl') }}
 
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "^1.10.5"
+          terraform_wrapper: false
+
       - name: Setup TFLint
         uses: terraform-linters/[email protected]
         with:
@@ -55,8 +61,6 @@ jobs:
       - name: Initializing viya4-iac-gcp
         run: terraform init
 
-        # Necessary so we can recursively tflint our modules folder
-        # not needed for regular project use.
       - name: Initializing viya4-iac-gcp/modules/google_vm
         run: terraform -chdir=modules/google_vm init
 

Dockerfile

@@ -1,12 +1,12 @@
 # Copyright © 2021-2024, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-ARG TERRAFORM_VERSION=1.9.6
-ARG GCP_CLI_VERSION=496.0.0
+ARG TERRAFORM_VERSION=1.10.5
+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.6
+ARG KUBECTL_VERSION=1.30.10
 ARG ENABLE_GKE_GCLOUD_AUTH_PLUGIN=True
 ARG INSTALL_COMPONENTS=""
 

README.md

@@ -31,10 +31,10 @@ Operational knowledge of
 
 - Terraform or Docker
   - #### Terraform
-    - [Terraform](https://www.terraform.io/downloads.html) - v1.9.6
-    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.6
+    - [Terraform](https://www.terraform.io/downloads.html) - v1.10.5
+    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.10
     - [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) - v496.0.0
+    - [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
   - #### Docker
     - [Docker](https://docs.docker.com/get-docker/)

main.tf

@@ -316,4 +316,5 @@ module "google_netapp" {
   protocols          = var.netapp_protocols
   volume_path        = "${var.prefix}-${var.netapp_volume_path}"
   allowed_clients    = join(",", [local.gke_subnet_cidr, local.misc_subnet_cidr])
+  depends_on         = [ module.gke ]
 }

versions.tf

@@ -7,31 +7,31 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "6.6.0"
+      version = "6.24.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "6.6.0"
+      version = "6.24.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.32" # Constrained by Google
+      version = "~> 2.36" # Constrained by Google
     }
     local = {
       source  = "hashicorp/local"
-      version = "~> 2.5"
+      version = "~> 2.5.2"  
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.6" # Constrained by Google
+      version = "~> 3.7.1" # Constrained by Google
     }
     null = {
       source  = "hashicorp/null"
       version = "~> 3.2" # Constrained by Google
     }
     external = {
       source  = "hashicorp/external"
-      version = "~> 2.3" # Constrained by Google
+      version = "~> 2.3.4" # Constrained by Google
     }
     time = {
       source  = "hashicorp/time"