Skip to content

Fix config for Registry Deployment TLS SecretName

Mitchell Nielsen requested to merge 4346-fix-registry-tls into master

What does this MR do?

Fix config for Registry Deployment TLS SecretName

Fixes the configuration for the Registry Deployment's TLS SecretName
by correctly referencing the Registry chart's `.tls.secretName` rather
than `global.registry.tls.secretName`.

Closes https://gitlab.com/gitlab-org/charts/gitlab/-/issues/4346

Changelog: fixed

and...

Consider 'global.registry.tls.secretName'

Rather than removing the consideration of the key
'global.registry.tls.secretName' in favor of the chart-local
'registry.tls.secretName', this change now considers both (giving
preference to the chart-local setting if both are provided).

This better maintains current configuration, and should make
https://gitlab.com/gitlab-org/charts/gitlab/-/issues/823
easier to implement.

Related issues

Closes #4346 (closed)

Related to #823 (closed)

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
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

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
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.

Closes #4346 (closed)

Edited by Jason Plum

Merge request reports