-
由 Stan Hu 创作于
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 https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3728: 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, https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149480 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 (https://gitlab.com/gitlab-org/gitlab/-/issues/461124), we can remove this from consideration for now. This allows consolidated settings to be used for the other upload types. Changelog: fixed
由 Stan Hu 创作于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 https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3728: 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, https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149480 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 (https://gitlab.com/gitlab-org/gitlab/-/issues/461124), we can remove this from consideration for now. This allows consolidated settings to be used for the other upload types. Changelog: fixed
代码所有者
将用户和群组指定为特定文件更改的核准人。 了解更多。