Commit bba9c0f4 authored by Stan Hu's avatar Stan Hu

Add missing object storage settings in task-runner

artifacts and uploads were not configured, leading to confusing results
when used with gitlab-rails console. Attempting to build an uploader
from the Rails console would error out with the message, "Object storage
is not enabled".
parent 6f5bbf19
Pipeline #61767688 passed with stages
in 41 minutes and 30 seconds
---
title: Add missing object storage settings in task-runner
merge_request: 793
author:
type: fixed
......@@ -44,7 +44,9 @@ data:
{{- end }}
artifacts:
enabled: true
{{- include "gitlab.appConfig.artifacts.configuration" (dict "config" $.Values.global.appConfig.artifacts "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.lfs.configuration" (dict "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.uploads.configuration" (dict "config" $.Values.global.appConfig.uploads "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.packages.configuration" (dict "config" $.Values.global.appConfig.packages "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.external_diffs.configuration" (dict "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 6 }}
{{- include "gitlab.appConfig.pseudonymizer.configuration" $ | nindent 6 }}
......
......@@ -163,7 +163,9 @@ spec:
path: objectstorage/.s3cfg
{{- end }}
{{- include "gitlab.minio.mountSecrets" $ | nindent 10 }}
{{- include "gitlab.appConfig.objectStorage.mountSecrets" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts) | nindent 10 }}
{{- include "gitlab.appConfig.objectStorage.mountSecrets" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs) | nindent 10 }}
{{- include "gitlab.appConfig.objectStorage.mountSecrets" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads) | nindent 10 }}
{{- include "gitlab.appConfig.objectStorage.mountSecrets" (dict "name" "packages" "config" $.Values.global.appConfig.packages) | nindent 10 }}
{{- include "gitlab.appConfig.objectStorage.mountSecrets" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs) | nindent 10 }}
{{- include "gitlab.appConfig.pseudonymizer.mountSecrets" $ | nindent 10 }}
......
......@@ -49,6 +49,16 @@ global:
proxy_download: true
bucket:
connection: {}
artifacts:
enabled: true
proxy_download: true
bucket:
connection: {}
uploads:
enabled: true
proxy_download: true
bucket:
connection: {}
packages:
enabled: true
proxy_download: true
......
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