[go: up one dir, main page]

Skip to content

Add "ciSecureFiles" field at object store check file

What does this MR do?

This merge requests add the ciSecureFiles argument in the object storage check helm template file. This check ensures that when a "global" object storage setup is used, all underlining objects will have the connection field empty.

For example this is what happens when I set a connection value for uploads

values.yaml

    object_store:
      enabled: true
      proxy_download: true
      connection:
        secret: gitlab-s3-credentials
        key: connection
    
    uploads:
      bucket: gitlab-uploads-bucket
      connection:
        secret: gitlab-s3-credentials2
        key: connection

Output

Error: UPGRADE FAILED: execution error at (gitlab/charts/gitlab/templates/NOTES.txt:210:3): 
CONFIGURATION CHECKS:
When consolidated object storage is enabled, for each item `bucket` must be specified and the `connection` must be empty. Check the following object storage configuration(s): uploads
helm.go:84: [debug] execution error at (gitlab/charts/gitlab/templates/NOTES.txt:210:3): 
CONFIGURATION CHECKS:
When consolidated object storage is enabled, for each item `bucket` must be specified and the `connection` must be empty. Check the following object storage configuration(s): uploads
UPGRADE FAILED

But, this error is not raised for ciSecureFiles. Therefore, is the need to add this to the check template.

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 Kostas Evangelou

Merge request reports

Loading