Skip to content

Exclude ci_secure_files from Workhorse-accelerated types

Stan Hu requested to merge sh-ci-secure-files-no-workhorse into master

What does this MR do and why?

This commit is needed to avoid disabling consolidated settings for other object types in case someone specifies storage-specific credentials for CI secure files that differ from the consolidated setting credentials.

As discovered in the Cloud Native GitLab Chart in gitlab-org/charts/gitlab!3728 (merged):

There are two cases to consider:

  1. ciSecureFiles.connection is configured with the same credentials with consolidated settings (object_store.connection).

  2. ciSecureFiles.connection is configured with different credentials than the consolidated settings (object_store.connection)

In the first case, !149480 (merged) will see that the credentials match and automatically "promote" the ciSecureFiles settings to use the consolidated settings. That's what happened on GitLab.com, and things worked smoothly.

In the second case, previously if ciSecureFiles were enabled then GitLab would determine that consolidated settings could not be used, effectively breaking working object storage settings.

Since CI secure files are not yet accelerated by Workhorse (#461124), we can remove this from consideration for now. This allows consolidated settings to be used for the other upload types.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

Edited by Stan Hu

Merge request reports

Loading