Skip to content

Simplify kas configuration overrides

Marshall Cottrell requested to merge marshall007/gitlab:kas-config-merging into master

What does this MR do?

Baseline kas configuration file references templated values and, when specified, customConfig fully overwrites the default configuration. This MR changes that behaviour, merging the templated defaults specified in the chart with the user-specified customConfig.

Related issues

Related to gitlab-org/cluster-integration/gitlab-agent#87 (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

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
Edited by Marshall Cottrell

Merge request reports