Merge pull request GoogleCloudPlatform#2045 from cdunbar13/hotfix-wai…

…t-for-startup-update Hotfix wait for startup update
cdunbar13 · Dec 14, 2023 · a7aaccf · a7aaccf
2 parents e8a7e20 + 6d50e05
commit a7aaccf
Show file tree

Hide file tree

Showing 47 changed files with 99 additions and 46 deletions.
diff --git a/.tflint.hcl b/.tflint.hcl
@@ -13,9 +13,14 @@
 // limitations under the License.
 plugin "google" {
   enabled = true
-  version = "0.23.0"
+  version = "0.26.0"
   source  = "github.com/terraform-linters/tflint-ruleset-google"
 }
+plugin "terraform" {
+  enabled = true
+  version = "0.5.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+}
 rule "terraform_deprecated_index" {
   enabled = true
 }

diff --git a/cmd/root.go b/cmd/root.go
@@ -52,7 +52,7 @@ HPC deployments on the Google Cloud Platform.`,
 				log.Fatalf("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.26.0",
+		Version:     "v1.26.1",
 		Annotations: annotation,
 	}
 )

diff --git a/community/modules/compute/gke-node-pool/variables.tf b/community/modules/compute/gke-node-pool/variables.tf
@@ -230,6 +230,7 @@ variable "timeout_update" {
 
 # Deprecated
 
+# tflint-ignore: terraform_unused_declarations
 variable "total_min_nodes" {
   description = "DEPRECATED: Use autoscaling_total_min_nodes."
   type        = number
@@ -240,6 +241,7 @@ variable "total_min_nodes" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "total_max_nodes" {
   description = "DEPRECATED: Use autoscaling_total_max_nodes."
   type        = number
@@ -250,6 +252,7 @@ variable "total_max_nodes" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "service_account" {
   description = "DEPRECATED: use service_account_email and scopes."
   type = object({

diff --git a/community/modules/compute/gke-node-pool/versions.tf b/community/modules/compute/gke-node-pool/versions.tf
@@ -26,6 +26,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.26.1"
   }
 }
diff --git a/community/modules/compute/htcondor-execute-point/versions.tf b/community/modules/compute/htcondor-execute-point/versions.tf
@@ -25,6 +25,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf
@@ -126,6 +126,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -136,6 +137,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -146,6 +148,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -263,6 +266,7 @@ variable "on_host_maintenance" {
   default     = "TERMINATE"
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string

diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.26.1"
   }
   required_version = ">= 0.13.0"
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.26.1"
   }
 }
diff --git a/community/modules/database/slurm-cloudsql-federation/versions.tf b/community/modules/database/slurm-cloudsql-federation/versions.tf
@@ -30,10 +30,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.1"
   }
 
   required_version = ">= 0.13.0"

diff --git a/community/modules/file-system/DDN-EXAScaler/variables.tf b/community/modules/file-system/DDN-EXAScaler/variables.tf
@@ -202,6 +202,7 @@ variable "boot" {
 # project: project name
 # family: image family name
 # name: !!DEPRECATED!! - image name
+# tflint-ignore: terraform_unused_declarations
 variable "image" {
   description = "DEPRECATED: Source image properties"
   type        = any

diff --git a/community/modules/file-system/cloud-storage-bucket/versions.tf b/community/modules/file-system/cloud-storage-bucket/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.26.1"
   }
   required_version = ">= 0.14.0"
 }
diff --git a/community/modules/file-system/gke-persistent-volume/versions.tf b/community/modules/file-system/gke-persistent-volume/versions.tf
@@ -29,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.26.1"
   }
 }
diff --git a/community/modules/file-system/nfs-server/versions.tf b/community/modules/file-system/nfs-server/versions.tf
@@ -30,7 +30,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.26.1"
   }
 
   required_version = ">= 0.14.0"

diff --git a/community/modules/project/service-account/variables.tf b/community/modules/project/service-account/variables.tf
@@ -31,6 +31,7 @@ variable "description" {
   default     = "Service Account"
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "descriptions" {
   description = "Deprecated; create single service accounts using var.description."
   type        = list(string)
@@ -71,6 +72,7 @@ variable "name" {
   type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "names" {
   description = "Deprecated; create single service accounts using var.name."
   type        = list(string)
@@ -88,6 +90,7 @@ variable "org_id" {
   default     = ""
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "prefix" {
   description = "Deprecated; prefix now set using var.deployment_name"
   type        = string

diff --git a/community/modules/project/service-enablement/versions.tf b/community/modules/project/service-enablement/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.26.1"
   }
 
   required_version = ">= 0.14.0"

diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf
@@ -16,7 +16,7 @@
 
 terraform {
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.26.1"
   }
 
   required_version = ">= 0.14.0"

diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf
@@ -16,7 +16,7 @@
 
 terraform {
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.26.1"
   }
 
   required_version = ">= 0.14.0"

diff --git a/community/modules/scheduler/gke-cluster/variables.tf b/community/modules/scheduler/gke-cluster/variables.tf
@@ -258,6 +258,7 @@ variable "timeout_update" {
 }
 
 # Deprecated
+# tflint-ignore: terraform_unused_declarations
 variable "service_account" {
   description = "DEPRECATED: use service_account_email and scopes."
   type = object({

diff --git a/community/modules/scheduler/gke-cluster/versions.tf b/community/modules/scheduler/gke-cluster/versions.tf
@@ -30,6 +30,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.26.1"
   }
 }
diff --git a/community/modules/scheduler/htcondor-access-point/versions.tf b/community/modules/scheduler/htcondor-access-point/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.26.1"
   }
 
   required_version = ">= 1.1"

diff --git a/community/modules/scheduler/htcondor-central-manager/versions.tf b/community/modules/scheduler/htcondor-central-manager/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.26.1"
   }
 
   required_version = ">= 1.1.0"

diff --git a/community/modules/scheduler/htcondor-pool-secrets/versions.tf b/community/modules/scheduler/htcondor-pool-secrets/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.26.1"
   }
 
   required_version = ">= 0.13.0"

diff --git a/community/modules/scheduler/htcondor-setup/versions.tf b/community/modules/scheduler/htcondor-setup/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-setup/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-setup/v1.26.1"
   }
 
   required_version = ">= 0.13.0"

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf
@@ -293,6 +293,7 @@ EOD
   default = []
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string
@@ -349,6 +350,7 @@ EOD
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "network_ip" {
   type        = string
   description = "DEPRECATED: Use `static_ips` variable to assign an internal static ip address."
@@ -575,6 +577,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -585,6 +588,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -595,6 +599,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf
@@ -92,6 +92,7 @@ variable "region" {
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "network_ip" {
   type        = string
   description = "DEPRECATED: Use `static_ips` variable to assign an internal static ip address."
@@ -154,6 +155,7 @@ variable "min_cpu_platform" {
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string
@@ -324,6 +326,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -334,6 +337,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -344,6 +348,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.26.1"
   }
 }