From 4d3fe1c8dcbd209fbacba6c278eff6a2fab09039 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 3 Dec 2025 22:44:51 -0600
Subject: [PATCH] fix variable

---
 .gitea/workflows/render-manifests-automerge.yaml | 16 +++++++++-------
 .gitea/workflows/render-manifests-dispatch.yaml  | 14 ++++++--------
 .gitea/workflows/render-manifests-merge.yaml     | 15 +++++++++------
 .gitea/workflows/render-manifests-push.yaml      | 15 +++++++++------
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/render-manifests-automerge.yaml b/.gitea/workflows/render-manifests-automerge.yaml
index caa45c43b..b6daff71e 100644
--- a/.gitea/workflows/render-manifests-automerge.yaml
+++ b/.gitea/workflows/render-manifests-automerge.yaml
@@ -147,6 +147,8 @@ jobs:
             chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
             chart_name=$(basename "$chart_path")
 
+            echo ""
+            echo ""
             echo ">> Rendering chart: $chart_name"
             echo ">> Chart path $chart_path"
 
@@ -171,37 +173,38 @@ jobs:
                 "stack")
                   echo ""
                   echo ">> Special Rendering for stack ..."
-                  helm template stack ./ --namespace argocd --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template stack ./ --namespace argocd --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "cilium")
                   echo ""
                   echo ">> Special Rendering for cilium ..."
-                  helm template cilium ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template cilium ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "coredns")
                   echo ""
                   echo ">> Special Rendering for coredns ..."
-                  helm template coredns ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template coredns ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "metrics-server")
                   echo ""
                   echo ">> Special Rendering for metrics-server ..."
-                  helm template metrics-server ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template metrics-server ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "prometheus-operator-crds")
                   echo ""
                   echo ">> Special Rendering for prometheus-operator-crds ..."
-                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 *)
                   echo ""
                   echo ">> Standard Rendering for $chart_name ..."
-                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
               esac
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
+              ls $OUTPUT_FOLDER
               echo ""
             else
               echo ""
@@ -211,7 +214,6 @@ jobs:
           done
 
           echo "----"
-
       - name: Check for Changes
         id: check-changes
         if: steps.check-dir-changes.outputs.changes-detected == 'true'
diff --git a/.gitea/workflows/render-manifests-dispatch.yaml b/.gitea/workflows/render-manifests-dispatch.yaml
index 5ccfcdf01..678f3b14e 100644
--- a/.gitea/workflows/render-manifests-dispatch.yaml
+++ b/.gitea/workflows/render-manifests-dispatch.yaml
@@ -159,32 +159,32 @@ jobs:
                 "stack")
                   echo ""
                   echo ">> Special Rendering for stack ..."
-                  helm template stack ./ --namespace argocd --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template stack ./ --namespace argocd --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "cilium")
                   echo ""
                   echo ">> Special Rendering for cilium ..."
-                  helm template cilium ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template cilium ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "coredns")
                   echo ""
                   echo ">> Special Rendering for coredns ..."
-                  helm template coredns ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template coredns ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "metrics-server")
                   echo ""
                   echo ">> Special Rendering for metrics-server ..."
-                  helm template metrics-server ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template metrics-server ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "prometheus-operator-crds")
                   echo ""
                   echo ">> Special Rendering for prometheus-operator-crds ..."
-                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 *)
                   echo ""
                   echo ">> Standard Rendering for $chart_name ..."
-                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
               esac
 
@@ -199,8 +199,6 @@ jobs:
             fi
           done
 
-          ls ${MAIN_DIR}
-
           echo "----"
 
       - name: Check for Changes
diff --git a/.gitea/workflows/render-manifests-merge.yaml b/.gitea/workflows/render-manifests-merge.yaml
index 82365f9b7..f8add2e79 100644
--- a/.gitea/workflows/render-manifests-merge.yaml
+++ b/.gitea/workflows/render-manifests-merge.yaml
@@ -152,6 +152,8 @@ jobs:
             chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
             chart_name=$(basename "$chart_path")
 
+            echo ""
+            echo ""
             echo ">> Rendering chart: $chart_name"
             echo ">> Chart path $chart_path"
 
@@ -176,37 +178,38 @@ jobs:
                 "stack")
                   echo ""
                   echo ">> Special Rendering for stack ..."
-                  helm template stack ./ --namespace argocd --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template stack ./ --namespace argocd --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "cilium")
                   echo ""
                   echo ">> Special Rendering for cilium ..."
-                  helm template cilium ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template cilium ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "coredns")
                   echo ""
                   echo ">> Special Rendering for coredns ..."
-                  helm template coredns ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template coredns ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "metrics-server")
                   echo ""
                   echo ">> Special Rendering for metrics-server ..."
-                  helm template metrics-server ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template metrics-server ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "prometheus-operator-crds")
                   echo ""
                   echo ">> Special Rendering for prometheus-operator-crds ..."
-                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 *)
                   echo ""
                   echo ">> Standard Rendering for $chart_name ..."
-                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
               esac
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
+              ls $OUTPUT_FOLDER
               echo ""
             else
               echo ""
diff --git a/.gitea/workflows/render-manifests-push.yaml b/.gitea/workflows/render-manifests-push.yaml
index fd154981e..7953b03c5 100644
--- a/.gitea/workflows/render-manifests-push.yaml
+++ b/.gitea/workflows/render-manifests-push.yaml
@@ -150,6 +150,8 @@ jobs:
             chart_path=${MAIN_DIR}/clusters/${CLUSTER}/helm/$dir
             chart_name=$(basename "$chart_path")
 
+            echo ""
+            echo ""
             echo ">> Rendering chart: $chart_name"
             echo ">> Chart path $chart_path"
 
@@ -174,37 +176,38 @@ jobs:
                 "stack")
                   echo ""
                   echo ">> Special Rendering for stack ..."
-                  helm template stack ./ --namespace argocd --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template stack ./ --namespace argocd --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "cilium")
                   echo ""
                   echo ">> Special Rendering for cilium ..."
-                  helm template cilium ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template cilium ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "coredns")
                   echo ""
                   echo ">> Special Rendering for coredns ..."
-                  helm template coredns ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template coredns ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "metrics-server")
                   echo ""
                   echo ">> Special Rendering for metrics-server ..."
-                  helm template metrics-server ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template metrics-server ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 "prometheus-operator-crds")
                   echo ""
                   echo ">> Special Rendering for prometheus-operator-crds ..."
-                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template prometheus-operator-crds ./ --namespace kube-system --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
                 *)
                   echo ""
                   echo ">> Standard Rendering for $chart_name ..."
-                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds | yq -s '$OUTPUT_FOLDER + .kind + "-" + .metadata.name'
+                  helm template "$chart_name" ./ --namespace "$chart_name" --include-crds --dry-run | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name'
                   ;;
               esac
 
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
+              ls $OUTPUT_FOLDER
               echo ""
             else
               echo ""