fix: render shared ingress annotations as a merged map and guard nil browser.ingress#569
Merged
pantierra merged 2 commits intoJul 22, 2026
Conversation
…browser.ingress Merging traefik entrypoints and user ingress.annotations via string concatenation dropped the newline between them, producing invalid YAML whenever both were set (whole release failed to template). Build a dict and toYaml it once instead; mergeOverwrite keeps user annotations winning over the generated entrypoints key. Also make eoapi.browserIngressPath nil-safe: browser.ingress: null crashed the browser Deployment render via the new SB_pathPrefix env, even with ingress disabled. Regression tests added for both.
lhoupert
force-pushed
the
fix/unified-ingress-annotations-nil-safety
branch
from
July 22, 2026 10:03
befe281 to
f4af997
Compare
Pin three previously untested behaviors of the centralized ingress logic: the strip-prefix middleware annotation and Middleware object are absent when no path needs stripping (the dangling-reference fix), the auth-proxied stac path is excluded from strip-prefix prefixes, and docServer honors ingress.rootPath.
Contributor
Please have a look at the AI Use Policy. In particular write clear, concise PR descriptions in your own words and make sure the code submissions also follow the contribution guidelines. |
Contributor
Author
|
Sorry it has been the case, claude generated a PR with an empty description. I have been editing it myself |
Contributor
|
Thanks. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Follow-up to reviewing #546. Fixes two render bugs in the centralized ingress helpers (traefik
entrypoints+ customingress.annotationsproduced invalid YAML;browser.ingress: nullcrashed the browser Deployment render), with regression tests that fail on the current branch head.The second commit adds pinning tests for guarantees the refactor delivers:
/stacpath stays out of the strip-prefix list,docServerhonorsingress.rootPath.For 1. , the middleware tests fail against the templates on
main, so they seem to lock in exactly the dangling-middleware fix #546 introduces.