fix: comments

Signed-off-by: matttrach <matt.trachier@suse.com>

Author: matttrach

modules/deploy/main.tf

@@ -51,7 +51,7 @@ locals {
 
 resource "file_local_directory" "deploy_path" {
   path        = local.deploy_path
-  permissions = "0775"
+  permissions = "0755"
 }
 
 resource "file_local_directory" "tf_data_dir" {
@@ -60,7 +60,7 @@ resource "file_local_directory" "tf_data_dir" {
   ]
   count       = (local.tf_data_dir != local.deploy_path ? 1 : 0)
   path        = local.tf_data_dir
-  permissions = "0775"
+  permissions = "0755"
 }
 
 ### Template Files ###
@@ -200,7 +200,7 @@ resource "file_local" "generate_files" {
   directory   = dirname("${local.deploy_path}/${each.key}")
   name        = basename(each.key)
   contents    = each.value
-  permissions = "0644"
+  permissions = "0600"
 }
 
 ## Deploy ##

modules/install_rancher/rancher/main.tf

@@ -219,8 +219,7 @@ resource "terraform_data" "wait_for_certificate_secret" {
 }
 
 
-# The Helm resource completes in less than 10 seconds
-#   at which time the tls-rancher-ingress secret is generated
+# Wait for the tls-rancher-ingress secret to be generated by the Helm release
 data "kubernetes_secret_v1" "certificate" {
   depends_on = [
     time_sleep.settle_before_rancher,

modules/install_rancher/rancher/variables.tf

@@ -23,6 +23,10 @@ variable "rke2_version" {
     The version of rke2 powering the cluster.
     This is used for determining ingress configuration.
   EOT
+  validation {
+    condition     = can(regex("^v\\d+\\.\\d+\\.\\d+\\+rke2r\\d+$", var.rke2_version))
+    error_message = "The rke2_version must match the format vX.Y.Z+rke2rN (eg. v1.34.7+rke2r1)."
+  }
 }
 variable "rancher_helm_repo" {
   type        = string

modules/install_rancher/rancher_externalTLS/variables.tf

@@ -23,6 +23,10 @@ variable "rke2_version" {
     The version of rke2 powering the cluster.
     This is used for determining ingress configuration.
   EOT
+  validation {
+    condition     = can(regex("^v?[0-9]+\\.[0-9]+\\.[0-9]+.*$", var.rke2_version))
+    error_message = "The rke2_version must be a valid version string, e.g., 'v1.28.4+rke2r1'."
+  }
 }
 variable "rancher_helm_repo" {
   type        = string
@@ -67,7 +71,7 @@ variable "rancher_helm_chart_values" {
       "agentTLSMode"              : "system-store"
     }
   EOT
-  default     = "{}"
+  default     = "e30="
   sensitive   = true
 }
 variable "ca_certs" {

modules/install_rancher/variables.tf

@@ -50,6 +50,10 @@ variable "rke2_version" {
     The version of rke2 powering the cluster.
     This is used for determining ingress configuration.
   EOT
+  validation {
+    condition     = can(regex("^v?[0-9]+\\.[0-9]+\\.[0-9]+.*$", var.rke2_version))
+    error_message = "The rke2_version must be a valid version string, e.g., 'v1.28.4+rke2r1'."
+  }
 }
 variable "rancher_helm_repo" {
   type        = string