Commit 0ff8b066 authored by Balasankar "Balu" C's avatar Balasankar "Balu" C

Move configuration of components using object storage to own templates

Signed-off-by: Balasankar "Balu" C's avatarBalasankar "Balu" C <balasankar@gitlab.com>
parent ce15184e
Pipeline #54864735 failed with stages
in 11 minutes and 25 seconds
......@@ -68,22 +68,11 @@ data:
{{- include "gitlab.appConfig.cronJobs" . | nindent 6 }}
{{ include "gitlab.appConfig.extra" . | indent 6 }}
{{- end }}
artifacts:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.artifacts.enabled }}{{ eq $.Values.global.appConfig.artifacts.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts "context" $) | nindent 8 }}
lfs:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.lfs.enabled }}{{ eq $.Values.global.appConfig.lfs.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 8 }}
uploads:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.uploads.enabled }}{{ eq $.Values.global.appConfig.uploads.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads "context" $) | nindent 8 }}
packages:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.packages.enabled }}{{ eq $.Values.global.appConfig.packages.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 8 }}
external_diffs:
when: {{ $.Values.global.appConfig.externalDiffs.when }}
enabled: {{ if kindIs "bool" $.Values.global.appConfig.externalDiffs.enabled }}{{ eq $.Values.global.appConfig.externalDiffs.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 8 }}
{{- 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 }}
pages:
enabled: false
......
......@@ -44,16 +44,9 @@ data:
{{- end }}
artifacts:
enabled: true
lfs:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.lfs.enabled }}{{ eq $.Values.global.appConfig.lfs.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 8 }}
packages:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.packages.enabled }}{{ eq $.Values.global.appConfig.packages.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 8 }}
external_diffs:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.externalDiffs.enabled }}{{ eq $.Values.global.appConfig.externalDiffs.enabled true }}{{ end }}
when: {{ $.Values.global.appConfig.externalDiffs.when }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 8 }}
{{- include "gitlab.appConfig.lfs.configuration" (dict "config" $.Values.global.appConfig.lfs "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 }}
pages:
enabled: false
......
......@@ -97,22 +97,11 @@ data:
ssl_url: {{ .gravatar.sslUrl }}
{{ include "gitlab.appConfig.extra" . | indent 6 }}
{{- end }}
artifacts:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.artifacts.enabled }}{{ eq $.Values.global.appConfig.artifacts.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts "context" $) | nindent 8 }}
lfs:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.lfs.enabled }}{{ eq $.Values.global.appConfig.lfs.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 8 }}
uploads:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.uploads.enabled }}{{ eq $.Values.global.appConfig.uploads.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads "context" $) | nindent 8 }}
packages:
enabled: {{ if kindIs "bool" $.Values.global.appConfig.packages.enabled }}{{ eq $.Values.global.appConfig.packages.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 8 }}
external_diffs:
when: {{ $.Values.global.appConfig.externalDiffs.when }}
enabled: {{ if kindIs "bool" $.Values.global.appConfig.externalDiffs.enabled }}{{ eq $.Values.global.appConfig.externalDiffs.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "external_diffs" "config" $.Values.global.appConfig.externalDiffs "context" $) | nindent 8 }}
{{- 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 }}
pages:
enabled: false
mattermost:
......
{{/*
Generates a templated config for artifacts key in gitlab.yml.
Usage:
{{ include "gitlab.appConfig.artifacts.configuration" ( \
dict \
"config" .Values.path.to.artifacts.config \
"context" $ \
) }}
*/}}
{{- define "gitlab.appConfig.artifacts.configuration" -}}
artifacts:
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "config" .config "context" .context) | nindent 2 }}
{{- end -}}{{/* "gitlab.appConfig.artifacts.configuration" */}}
{{/*
Generates a templated config for external_diffs key in gitlab.yml.
Usage:
{{ include "gitlab.appConfig.external_diffs.configuration" ( \
dict \
"config" .Values.path.to.external_diffs.config \
"context" $ \
) }}
*/}}
{{- define "gitlab.appConfig.external_diffs.configuration" -}}
external_diffs:
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
when: {{ .config.when }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "config" .config "context" .context) | nindent 2 }}
{{- end -}}{{/* "gitlab.appConfig.external_diffs.configuration" */}}
{{/*
Generates a templated config for lfs key in gitlab.yml.
Usage:
{{ include "gitlab.appConfig.lfs.configuration" ( \
dict \
"config" .Values.path.to.lfs.config \
"context" $ \
) }}
*/}}
{{- define "gitlab.appConfig.lfs.configuration" -}}
lfs:
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "config" .config "context" .context) | nindent 2 }}
{{- end -}}{{/* "gitlab.appConfig.lfs.configuration" */}}
{{/*
Generates a templated config for packages key in gitlab.yml.
Usage:
{{ include "gitlab.appConfig.packages.configuration" ( \
dict \
"config" .Values.path.to.packages.config \
"context" $ \
) }}
*/}}
{{- define "gitlab.appConfig.packages.configuration" -}}
packages:
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "config" .config "context" .context) | nindent 2 }}
{{- end -}}{{/* "gitlab.appConfig.packages.configuration" */}}
{{/*
Generates a templated config for uploads key in gitlab.yml.
Usage:
{{ include "gitlab.appConfig.uploads.configuration" ( \
dict \
"config" .Values.path.to.uploads.config \
"context" $ \
) }}
*/}}
{{- define "gitlab.appConfig.uploads.configuration" -}}
uploads:
enabled: {{ if kindIs "bool" .config.enabled }}{{ eq .config.enabled true }}{{ end }}
{{- include "gitlab.appConfig.objectStorage.configuration" (dict "config" .config "context" .context) | nindent 2 }}
{{- end -}}{{/* "gitlab.appConfig.uploads.configuration" */}}
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