Skip to content

Pages: fix config generation for internal TLS

Jason Plum requested to merge 3436-pages-internal-tls into master

What does this MR do?

Update the gitlab/gitlab-pages chart to use the gitlab.workhorse.url template to generate the internal API endpoint urls within the config.toml for the Pages daemon.

Testing

helm template . -f build/base.yaml -f examples/internal-tls/shared-cert-values.yaml \
    --set global.pages.enabled=true \
    --show-only charts/gitlab/charts/gitlab-pages/templates/configmap.yml

Before:

    artifacts-server=http://release-name-webservice-default.default.svc:8181/api/v4
    internal-gitlab-server=http://release-name-webservice-default.default.svc:8181

After:

    artifacts-server=https://release-name-webservice-default.default.svc:8181/api/v4
    internal-gitlab-server=https://release-name-webservice-default.default.svc:8181

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
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened

Closes #3436 (closed)

Edited by Mitchell Nielsen

Merge request reports