values-override file not found issue fixed
This commit is contained in:
parent
c413f50183
commit
29a7ffc505
@ -342,10 +342,8 @@ spec:
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for edited values content and create separate values files
|
# Check for edited values content (will be embedded as inline values)
|
||||||
# Using separate files avoids YAML indentation issues with inline values blocks
|
|
||||||
EDITED_CONTENT=$(echo "$VALUES_CONTENT_EDITS" | jq -r ".\"$service\" // empty")
|
EDITED_CONTENT=$(echo "$VALUES_CONTENT_EDITS" | jq -r ".\"$service\" // empty")
|
||||||
EXTRA_VALUES_FILES=""
|
|
||||||
|
|
||||||
# Extract ingress hostname from GITEA_URL domain
|
# Extract ingress hostname from GITEA_URL domain
|
||||||
INGRESS_DOMAIN=$(echo "$GITEA_URL" | sed 's|https://gitea\.||' | sed 's|http://gitea\.||')
|
INGRESS_DOMAIN=$(echo "$GITEA_URL" | sed 's|https://gitea\.||' | sed 's|http://gitea\.||')
|
||||||
@ -354,18 +352,15 @@ spec:
|
|||||||
HTTPROUTE_HOST="${SANITIZED_SERVICE}-${NAMESPACE}.${INGRESS_DOMAIN}"
|
HTTPROUTE_HOST="${SANITIZED_SERVICE}-${NAMESPACE}.${INGRESS_DOMAIN}"
|
||||||
echo " HTTPRoute hostname: $HTTPROUTE_HOST"
|
echo " HTTPRoute hostname: $HTTPROUTE_HOST"
|
||||||
|
|
||||||
|
# Build inline values block if user provided edited content
|
||||||
|
INLINE_VALUES=""
|
||||||
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 " User edited values content detected, embedding as inline values..."
|
||||||
VALUES_OVERRIDE_FILE="values-override-${SANITIZED_SERVICE}.yaml"
|
# Indent the content for YAML embedding (16 spaces = nested under helm.values)
|
||||||
|
INDENTED_CONTENT=$(echo "$EDITED_CONTENT" | sed 's/^/ /')
|
||||||
# Write user edits to override file (no ingress annotations needed with Gateway API)
|
INLINE_VALUES="
|
||||||
cat > "manifests/$VALUES_OVERRIDE_FILE" <<OVERRIDE_EOF
|
values: |
|
||||||
$EDITED_CONTENT
|
$INDENTED_CONTENT"
|
||||||
OVERRIDE_EOF
|
|
||||||
|
|
||||||
echo " Created: manifests/$VALUES_OVERRIDE_FILE"
|
|
||||||
EXTRA_VALUES_FILES="
|
|
||||||
- $VALUES_OVERRIDE_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)
|
||||||
@ -405,7 +400,7 @@ spec:
|
|||||||
path: $HELM_PATH
|
path: $HELM_PATH
|
||||||
helm:
|
helm:
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $HELM_VALUES$EXTRA_VALUES_FILES
|
- $HELM_VALUES$INLINE_VALUES
|
||||||
parameters:
|
parameters:
|
||||||
- name: mysql.enabled
|
- name: mysql.enabled
|
||||||
value: "$MYSQL_ENABLED"
|
value: "$MYSQL_ENABLED"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user