Skip to content

Draft: Fix missing microsoft_graph_mailer secret dir

Adam Mulvany requested to merge fix-missing-ms-graph-mailer-secret-dir into master

What does this MR do?

The gitlab-sidekiq config map copies secrets from a list of items specified in the _configure.tpl template.

It is missing for the microsoft_graph_mailer feature causing it to throw the following error in the dependencies container for Sidekiq and Webservice:

Writing /srv/gitlab/config/cable.yml
Writing /srv/gitlab/config/database.yml
Writing /srv/gitlab/config/gitlab.yml
/var/opt/gitlab/templates/gitlab.yml.erb:33:in `read': No such file or directory @ rb_sysopen - /etc/gitlab/microsoft_graph_mailer/client_secret (Errno::ENOENT)
	from /var/opt/gitlab/templates/gitlab.yml.erb:33:in `<main>'
	from /usr/lib/ruby/2.7.0/erb.rb:905:in `eval'
	from /usr/lib/ruby/2.7.0/erb.rb:905:in `result'
	from /usr/lib/ruby/2.7.0/erb.rb:890:in `run'
	from /usr/bin/erb:154:in `run'
	from /usr/bin/erb:175:in `<main>'

This MR adds the item to the hardcoded list.

Related issues

This was reported by a customer in https://gitlab.zendesk.com/agent/tickets/350841 (internal use only)

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

Merge request reports