gitea_admin/osmos-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Vaibhav Pathak 2026-02-11 15:18:51 +05:30
parent 8c22e885cd
commit 62c3afe293
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
environment-provisioner/workflow-template.yaml
View File

@ -342,35 +342,40 @@ spec:
done done
fi fi
# Initialize INLINE_VALUES with ingress annotations # Check for edited values content and create separate values files
# Dotted annotation keys (like nginx.ingress.kubernetes.io/ssl-redirect) must use # Using separate files avoids YAML indentation issues with inline values blocks
# the values block, not parameters. Helm's --set interprets dots as nested paths.
INLINE_VALUES="
values: |
ingress:
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: \"true\"
nginx.ingress.kubernetes.io/ssl-redirect: \"true\"
cert-manager.io/cluster-issuer: letsencrypt-prod"
# Check for edited values content - merge with base annotations
EDITED_CONTENT=$(echo "$VALUES_CONTENT_EDITS" | jq -r ".\"$service\" // empty") EDITED_CONTENT=$(echo "$VALUES_CONTENT_EDITS" | jq -r ".\"$service\" // empty")
EXTRA_VALUES_FILES=""
if [ -n "$EDITED_CONTENT" ] && [ "$EDITED_CONTENT" != "null" ]; then if [ -n "$EDITED_CONTENT" ] && [ "$EDITED_CONTENT" != "null" ]; then
echo " Writing edited values content to override file..." echo " Writing edited values content to override file..."
# Write the edited content to a values override file
VALUES_OVERRIDE_FILE="values-override-${SANITIZED_SERVICE}.yaml" VALUES_OVERRIDE_FILE="values-override-${SANITIZED_SERVICE}.yaml"
echo "$EDITED_CONTENT" > "manifests/$VALUES_OVERRIDE_FILE"
# Write ingress annotations + user edits to a single file
cat > "manifests/$VALUES_OVERRIDE_FILE" <<OVERRIDE_EOF
ingress:
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/ssl-redirect: "true"
cert-manager.io/cluster-issuer: letsencrypt-prod
$EDITED_CONTENT
OVERRIDE_EOF
echo " Created: manifests/$VALUES_OVERRIDE_FILE" echo " Created: manifests/$VALUES_OVERRIDE_FILE"
# Set inline values for ArgoCD - merge user edits with base ingress annotations EXTRA_VALUES_FILES="
INDENTED_CONTENT=$(echo "$EDITED_CONTENT" | sed 's/^/ /') - $VALUES_OVERRIDE_FILE"
INLINE_VALUES=" else
values: | # No user edits - still need ingress annotations in a separate file
ingress: INGRESS_FILE="ingress-annotations-${SANITIZED_SERVICE}.yaml"
annotations: cat > "manifests/$INGRESS_FILE" <<INGRESS_EOF
nginx.ingress.kubernetes.io/force-ssl-redirect: \"true\" ingress:
nginx.ingress.kubernetes.io/ssl-redirect: \"true\" annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
$INDENTED_CONTENT" nginx.ingress.kubernetes.io/ssl-redirect: "true"
cert-manager.io/cluster-issuer: letsencrypt-prod
INGRESS_EOF
EXTRA_VALUES_FILES="
- $INGRESS_FILE"
fi fi
# Process external params for disabled Helm dependencies (e.g., external database config) # Process external params for disabled Helm dependencies (e.g., external database config)
@ -413,7 +418,7 @@ spec:
path: $HELM_PATH path: $HELM_PATH
helm: helm:
valueFiles: valueFiles:
- $HELM_VALUES$INLINE_VALUES - $HELM_VALUES$EXTRA_VALUES_FILES
parameters: parameters:
- name: mysql.enabled - name: mysql.enabled
value: "$MYSQL_ENABLED" value: "$MYSQL_ENABLED"