Fix toolbox deployments when no backup config is provided
What does this MR do?
In cf1ecb18 we simplified the condition for defining a backup config secret as part of !3699 (merged). However, if a GitLab admin disabled MinIO, the change would require the admin to configure a backup secret unless Google Cloud Storage (GCS) were used as the backend.
Restore the previous behavior of allowing the toolbox to be deployed
even if no backups are enabled. We only need to check if that value is
set for object storage to be configured. We can drop the check on
global.minio.enabled
because:
-
For the internal MinIO instance,
gitlab.toolbox.backups.objectStorage.config
can be left empty. -
If the internal MinIO instance is disabled, then that means either backups are configured via S3/Azure/GCS or not at all. In the former case,
gitlab.toolbox.backups.objectStorage.config
must not be empty. If the latter case, thengitlab.toolbox.backups.objectStorage.config
can be left blank.
Related issues
Relates to #5536 (closed)
Author 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, follow the instructions in the "Reviewer Roulette" section of the Danger Bot MR comment, as per the Distribution experimental MR workflow
For merge requests from forks, consider the following options for Danger to work properly:
- Consider using our community forks instead of forking your own project. These community forks have the GitLab API token preconfigured.
- Alternatively, see our documentation on configuring Danger for personal forks.
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes -
Documentation created/updated -
Tests added/updated -
Integration tests added to GitLab QA -
Equivalent MR/issue for omnibus-gitlab opened -
Equivalent MR/issue for Gitlab Operator project opened (see Operator documentation on impact of Charts changes) -
Validate potential values for new configuration settings. Formats such as integer 10
, duration10s
, URIscheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.