Skip to content

Use custom gateway ingress host in OpenShift tenant redirect URLs. - #1629

Open
akshitkumawat wants to merge 1 commit into
grafana:mainfrom
akshitkumawat:fix-custom-gateway-ingress-host-redirect
Open

Use custom gateway ingress host in OpenShift tenant redirect URLs.#1629
akshitkumawat wants to merge 1 commit into
grafana:mainfrom
akshitkumawat:fix-custom-gateway-ingress-host-redirect

Conversation

@akshitkumawat

Copy link
Copy Markdown

Summary

  • When spec.template.gateway.ingress.host is set, the OpenShift gateway Route already uses that hostname, but OpenShift tenant redirectURL values in tenants.yaml were still built from the generated Route FQDN (tempo-<name>-gateway-<namespace>.<baseDomain>).
  • Tenant redirect URLs now use the same effective hostname as the Route: the configured ingress host when present, otherwise the existing generated Route hostname.
  • Default behavior is unchanged when no custom gateway ingress host is configured.

Test plan

  • go test ./internal/manifests/gateway/
  • Custom ingress host produces https://<custom-host>/openshift/<tenant>/callback
  • No custom host still uses naming.RouteFqdn for redirectURL
  • Multiple tenants share the same gateway host and keep tenant-specific callback paths (/openshift/dev/callback, /openshift/test/callback)
  • Existing gateway unit tests continue to pass

When spec.template.gateway.ingress.host is set, the OpenShift Route already
uses that hostname, but tenants.yaml still used the generated Route FQDN for
redirectURL. Derive both from the same effective gateway hostname.

Signed-off-by: Akshit Kumawat <akshit2433@gmail.com>
@github-actions

Copy link
Copy Markdown
Contributor

Signed commits report

1 of 1 commit between main and fix-custom-gateway-ingress-host-redirect could not be fully verified:

Commit Author Reason Message
bdada814 Akshit Kumawat unsigned Use custom gateway ingress host in OpenShift tenant redirect URLs.

This repository requires all commits to be signed. See GitHub docs on commit signature verification.

@cla-assistant

cla-assistant Bot commented Aug 29, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@cla-assistant

cla-assistant Bot commented Aug 29, 2026

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant