Apply suggestions to kustomization handling

Author: vsalomaki

kustomization_user.tf

@@ -17,13 +17,10 @@ locals {
   user_kustomize_defaulted = length(var.user_kustomizations) > 0 ? var.user_kustomizations : local.default_user_kustomize
 
   processed_kustomizes = {
-    for key, config in local.user_kustomize_defaulted : key => {
+    for key, config in local.user_kustomize_defaulted : key => merge(config, {
       # kustomize_parameters may contain secrets
       kustomize_parameters = sensitive(config.kustomize_parameters)
-      source_folder        = config.source_folder
-      pre_commands         = config.pre_commands
-      post_commands        = config.post_commands
-    }
+    })
   }
 }
 

modules/user_kustomizations/main.tf

@@ -55,11 +55,11 @@ resource "null_resource" "kustomization_user_deploy" {
           echo "Running pre-install script from $dest_folder"
           /bin/bash "$dest_folder/preinstall.sh"
 
-          if [ -s "$dest_folder/kustomization.yaml" ]; then
+          if [ -s "$dest_folder/kustomization.yaml" ] || [ -s "$dest_folder/kustomization.yml" ] || [ -s "$dest_folder/Kustomization" ]; then
             echo "Applying kustomization from $dest_folder"
             kubectl apply -k "$dest_folder"
           else
-            echo "No kustomization.yaml in $dest_folder, skipping apply."
+            echo "No valid kustomization file found in $dest_folder, skipping apply."
           fi
 
           echo "Running post-install script from $dest_folder"