Skip to content

Fix incorrect hostname in webservice configuration

Tim Ysewyn requested to merge TYsewyn/gitlab:fix/incorrect-gitlab-hostname into master

What does this MR do?

Fixes the issue that the webservice configuration contained the incorrect hostname when global.hosts.gitlab.hostnameOverride is set.

Given the following Helm configuration:

...
global:
  hosts:
    domain: example.com
    gitlab:
      hostnameOverride: my-gitlab.com
...

Prior to this change a K8s ingress would be created to accept HTTP traffic on my-gitlab.com. The webservice component, however, would have been configured with gitlab.example.com as the host. This would result in links, like profile pages and git URLs, to be rendered incorrectly in the UI because of the host mismatch.

Related issues

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added (test in webservice Helm chart has been updated)
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Tim Ysewyn

Merge request reports