From 49caf24f256ce38ccb4a506d50334a0e40d156dd Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Tue, 9 Dec 2025 23:43:05 -0600
Subject: [PATCH] apply an additional formatting step

---
 .gitea/workflows/render-manifests-automerge.yaml | 5 +++++
 .gitea/workflows/render-manifests-dispatch.yaml  | 5 +++++
 .gitea/workflows/render-manifests-merge.yaml     | 5 +++++
 .gitea/workflows/render-manifests-push.yaml      | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/.gitea/workflows/render-manifests-automerge.yaml b/.gitea/workflows/render-manifests-automerge.yaml
index 7783f9048..1a3ee42bf 100644
--- a/.gitea/workflows/render-manifests-automerge.yaml
+++ b/.gitea/workflows/render-manifests-automerge.yaml
@@ -193,6 +193,11 @@ jobs:
               echo ">> Formating rendered template ..."
               echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
+              # Strip comments again to ensure formatting correctness
+              for $file in $OUTPUT_FOLDER; do
+                yq -i '... comments=""' $file
+              done
+
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
               ls $OUTPUT_FOLDER
diff --git a/.gitea/workflows/render-manifests-dispatch.yaml b/.gitea/workflows/render-manifests-dispatch.yaml
index 4b391008c..24cc866d6 100644
--- a/.gitea/workflows/render-manifests-dispatch.yaml
+++ b/.gitea/workflows/render-manifests-dispatch.yaml
@@ -178,6 +178,11 @@ jobs:
               echo ">> Formating rendered template ..."
               echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
+              # Strip comments again to ensure formatting correctness
+              for $file in $OUTPUT_FOLDER; do
+                yq -i '... comments=""' $file
+              done
+
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
               ls $OUTPUT_FOLDER
diff --git a/.gitea/workflows/render-manifests-merge.yaml b/.gitea/workflows/render-manifests-merge.yaml
index 590d5b257..3f498212e 100644
--- a/.gitea/workflows/render-manifests-merge.yaml
+++ b/.gitea/workflows/render-manifests-merge.yaml
@@ -198,6 +198,11 @@ jobs:
               echo ">> Formating rendered template ..."
               echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
+              # Strip comments again to ensure formatting correctness
+              for $file in $OUTPUT_FOLDER; do
+                yq -i '... comments=""' $file
+              done
+
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
               ls $OUTPUT_FOLDER
diff --git a/.gitea/workflows/render-manifests-push.yaml b/.gitea/workflows/render-manifests-push.yaml
index 7450954a0..43a9da902 100644
--- a/.gitea/workflows/render-manifests-push.yaml
+++ b/.gitea/workflows/render-manifests-push.yaml
@@ -196,6 +196,11 @@ jobs:
               echo ">> Formating rendered template ..."
               echo "$TEMPLATE" | yq '... comments=""' | yq 'select(. != null)' | yq -s '"'"$OUTPUT_FOLDER"'" + .kind + "-" + .metadata.name + ".yaml"'
 
+              # Strip comments again to ensure formatting correctness
+              for $file in $OUTPUT_FOLDER; do
+                yq -i '... comments=""' $file
+              done
+
               echo ""
               echo ">> Manifests for $chart_name rendered to $OUTPUT_FOLDER"
               ls $OUTPUT_FOLDER