Apply recommendations from gemini to user_kustomization

Author: vsalomaki

kube.tf.example

@@ -968,7 +968,8 @@ module "kube-hetzner" {
   # kustomize_parameters: Key-value map for passing variables into Kustomization. Applies only to the Kustomization-set in the object, but to all files defined in the source_folder of the "set". Defaults to {}.
   # pre_commands: Commands to be executed before applying the Kustomization ("kubectl apply -k"). Defaults to "".
   # post_commands: Commands to be executed after applying the Kustomization ("kubectl apply -k"). You can use it to wait for CRD deployment etc. Defaults to "".
-  # - An example to wait for deployments in all namespaces: `kubectl wait --for=condition=Available deployment --all -A --timeout=120s || exit 0` (The `|| exit 0` is not "required", it just makes the deployment to continue even if a deployment hasn't started up properly)
+  # - An example to wait for deployments in all namespaces: `kubectl wait --for=condition=Available deployment --all -A --timeout=120s || exit 0` (The `|| exit 0` is completely optional; it allows the script to proceed even if the wait command times out and fails, preventing the entire sequence from being aborted.)
+  # - It is recommended to use a more specific `kubectl wait`-commands depending on the case and filter according to certain deployment or a pod.
   # - You can pass full bash-compatible scripts into the `post_commands`-variable with EOT
   # 
   # An example from the default values:

modules/user_kustomizations/main.tf

@@ -42,12 +42,20 @@ resource "null_resource" "kustomization_user_deploy" {
     inline = [
       <<-EOT
       #!/bin/bash
+      set -e
+
+      function cleanup {
+        echo "Cleaning up ${local.base_destination_folder}..."
+        rm -rf ${local.base_destination_folder}
+      }
+      trap cleanup EXIT
+
       for dest_folder in ${join(" ", local.sorted_kustomization_destination_folders)}; do
         if [ -d "$dest_folder" ]; then
           echo "Running pre-install script from $dest_folder"
           /bin/bash "$dest_folder/preinstall.sh"
 
-          if [ -f "$dest_folder/kustomization.yaml" ]; then
+          if [ -s "$dest_folder/kustomization.yaml" ]; then
             echo "Applying kustomization from $dest_folder"
             kubectl apply -k "$dest_folder"
           else
@@ -58,8 +66,6 @@ resource "null_resource" "kustomization_user_deploy" {
           /bin/bash "$dest_folder/postinstall.sh"
         fi
       done
-      echo "Cleaning up ${local.base_destination_folder}..."
-      rm -rf ${local.base_destination_folder}/*
       EOT
     ]
   }

modules/user_kustomizations/variables.tf

@@ -26,7 +26,7 @@ variable "kustomizations_map" {
   validation {
     condition = alltrue([
       for key in keys(var.kustomizations_map) :
-      tonumber(key) > 0 && floor(tonumber(key)) == tonumber(key) && can(regex("^[0-9]+$", key))
+      can(regex("^[0-9]+$", key)) && tonumber(key) > 0
     ])
     error_message = "All keys in kustomizations_map must be numeric strings (e.g., '1', '2')."
   }