Fix Jinja2 whitespace handling in dataplane_cr template #1195
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The bgp-l3-xl adoption configuration (PR openstack-k8s-operators#1098) introduced Jinja2 whitespace control operators ({%+ and +%}) that cause incorrect YAML indentation when the bgp conditional block is skipped. When bgp is false (the default for most adoption scenarios), the generated nodeset-cell1.yaml file has invalid YAML syntax: edpm_telemetry_node_exporter_image: "..." edpm_container_registry_logins: <- 16 spaces instead of 8 images.paas.redhat.com: This causes the error: yaml: line 139: did not find expected key Changes: - Replace {% endif %} with {% endif -%} to trim trailing newline - Replace {% if bgp | bool +%} with {% if bgp | bool %} to avoid preserving extra whitespace - Replace {%+ endif +%} with {% endif -%} for consistent trimming - Replace {%- if ... -%} with {% if ... %} for the registry_logins block - Remove incorrect {{ login | indent(10) }} filter that was applying indentation to the login string content rather than the line Signed-off-by: Mauricio Harley <[email protected]>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The bgp-l3-xl adoption configuration (PR #1098) introduced Jinja2 whitespace control operators ({%+ and +%}) that cause incorrect YAML indentation when the bgp conditional block is skipped.
When bgp is false (the default for most adoption scenarios), the generated nodeset-cell1.yaml file has invalid YAML syntax:
This causes the error:
yaml: line 139: did not find expected key
Changes: