Commit f8aa5c90 authored by Jason Plum's avatar Jason Plum

Merge branch '1135-mr-diff-object-storage' into 'master'

Add support for using object storage for storing MR diffs

Closes #1135

See merge request charts/gitlab!698
parents a11a209a c8708bba
Pipeline #49355680 passed with stages
in 31 minutes and 58 seconds
---
title: Add support for using object storage for storing MR diffs
merge_request: 698
author:
type: added
......@@ -72,6 +72,7 @@ data:
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.pseudonymizer.configuration" $ | nindent 6 }}
pages:
enabled: false
......
......@@ -90,6 +90,10 @@ global:
proxy_download: true
bucket:
connection: {}
externalDiffs:
proxy_download: true
bucket:
connection: {}
ldap:
servers: {}
# 'main' is the GitLab 'provider ID' of this LDAP server
......
......@@ -46,6 +46,7 @@ data:
enabled: true
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.pseudonymizer.configuration" $ | nindent 6 }}
pages:
enabled: false
......
......@@ -54,6 +54,10 @@ global:
proxy_download: true
bucket:
connection: {}
externalDiffs:
proxy_download: true
bucket:
connection: {}
ldap:
servers: {}
# 'main' is the GitLab 'provider ID' of this LDAP server
......
......@@ -101,6 +101,7 @@ data:
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 6 }}
pages:
enabled: false
mattermost:
......
......@@ -117,6 +117,10 @@ global:
proxy_download: true
bucket:
connection: {}
externalDiffs:
proxy_download: true
bucket:
connection: {}
ldap:
servers: {}
# 'main' is the GitLab 'provider ID' of this LDAP server
......
......@@ -11,7 +11,7 @@ Usage:
*/}}
{{- define "gitlab.appConfig.objectStorage.configuration" -}}
{{ .name }}:
enabled: {{ eq .config.enabled true }}
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
object_store:
enabled: true
remote_directory: {{ .config.bucket }}
......
......@@ -127,6 +127,7 @@ defaultBuckets:
- name: gitlab-packages
- name: tmp
- name: gitlab-pseudo
- name: gitlab-mr-diffs
## If enabled, must be a string with length > 0
# - name: example
## Can be one of none|download|upload|public, defaults to `none`
......
......@@ -336,6 +336,11 @@ global:
proxy_download: true
bucket: gitlab-packages
connection: {}
externalDiffs:
enabled:
proxy_download: true
bucket: gitlab-mr-diffs
connection: {}
backups:
bucket: gitlab-backups
incomingEmail:
......@@ -409,7 +414,7 @@ under the `extra` key below `appConfig`:
| `extra.piwikSiteId` | String | (empty) | Piwik Site ID. |
| `extra.piwikUrl` | String | (empty) | Piwik Url. |
### LFS / Artifacts / Uploads / Packages
### LFS / Artifacts / Uploads / Packages / External MR diffs
Details on these settings are below. Documentation is not repeated individually,
as they are structurally identical aside from the default value of the `bucket` property.
......@@ -425,7 +430,7 @@ as they are structurally identical aside from the default value of the `bucket`
| Name | Type | Default | Description |
|:---------------- |:-------:|:------- |:----------- |
| `enabled` | Boolean | `true` | Enable the use of these features with object storage. |
| `enabled` | Boolean | `true` except for MR diffs | Enable the use of these features with object storage. |
| `proxy_download` | Boolean | `true` | Enable proxy of all downloads via GitLab, in place of direct downloads from the `bucket`. |
| `bucket` | String | Various | Name of the bucket to use from object storage provider. Default will be `git-lfs`, `gitlab-artifacts`, `gitlab-uploads`, or `gitlab-packages`, depending on the service. |
| `connection` | String | `{}` | [See below](#connection). |
......
......@@ -15,7 +15,7 @@ Several changes occurred during the beta cycle, which require being adddress pri
The list of breaking changes:
* [minio chart's enabled flag](../charts/globals.md#configure-minio-settings) has been [moved to global configuration](https://gitlab.com/charts/gitlab/merge_requests/389)
* [registry chart's storage configuration](../charts/registry/index.md#storage) has been [reimplemented as a secret](https://gitlab.com/charts/gitlab/issues/548)
* [Object storage configuration](../charts/globals.md#lfs-artifacts-uploads) has been [re-implemented as globally configured secrets](https://gitlab.com/charts/gitlab/issues/502)
* [Object storage configuration](../charts/globals.md#lfs-artifacts-uploads-packages-external-mr-diffs) has been [re-implemented as globally configured secrets](https://gitlab.com/charts/gitlab/issues/502)
* The [workhorse container has been split from unicorn](https://gitlab.com/charts/gitlab/merge_requests/397) and now has its [own docker image that needs to be set when swapping to the CE images](../installation/deployment.md#deploy-the-community-edition).
## Known issues and limitations
......
......@@ -135,7 +135,7 @@ global:
piwikUrl:
piwikSiteId:
## doc/charts/globals.md#lfs-artifacts-uploads-packages
## doc/charts/globals.md#lfs-artifacts-uploads-packages-external-mr-diffs
lfs:
bucket: git-lfs
connection: {}
......@@ -154,6 +154,9 @@ global:
packages:
bucket: gitlab-packages
connection: {}
externalDiffs:
bucket: gitlab-mr-diffs
connection: {}
## doc/charts/globals.md#pseudonymizer-settings
pseudonymizer:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment