Merge branch 'main' of https://gitea.alexlebens.net/alexlebens/infrastructure

.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

.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

.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

.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