Skip to content

Mount the microsoft_graph_mailer client secret in the backup-job pod

Jason Young requested to merge 4699-fix-backup-job-mount into master

What does this MR do?

In Add microsoft_graph_mailer settings (!2784 - merged) we added the ability to utilize the Microsoft Graph protocol for outgoing mail - however we missed adding the secret mount to the backup CronJob pod spec, resulting in errors when attempting to create a JobPod for backups.

This fixes that mount.

Mount the microsoft_graph_mailer client secret in the backup-job pod

Without this mount - the backup job fails with an error
because the backup rake tasks can’t load the specified
microsoft graph mailer secret defined in the gitlab.yml

Changelog: fixed
Signed-off-by: Jason Young <jyoung@gitlab.com>

Related issues

Closes #4699 (closed)

Test plan

I've tested this in deployment with a working MS Graph implementation. I didn't try to test outbound mail from the CronJob invocation (if even that triggers something). However, I did verify the presence of the crashing error reported in #4699 (closed) prior to deployment, and verified that the secret mount addressed the crashing error.

Just deploying with the example values in #4699 (closed) should verify that there's no error due to the missing reference to the secret mount.

The tests added validate that the secret mount is present when backups are enabled and Microsoft Graph is enabled.

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.
Edited by Jason Young

Merge request reports