Commit 1cbc4e17 authored by DJ Mountney's avatar DJ Mountney

Merge branch '1189-add-gitaly-mapping-to-migrations' into 'master'

Migrations: add Gitaly configuration

Closes #1189

See merge request charts/gitlab!710
parents a1a447a8 24329990
Pipeline #50458702 passed with stages
in 46 minutes and 20 seconds
---
title: Add Gitaly configuration to migrations job
merge_request: 710
author:
type: fixed
......@@ -91,6 +91,11 @@ spec:
items:
- key: secrets.yml
path: rails-secrets/secrets.yml
- secret:
name: {{ template "gitlab.gitaly.authToken.secret" . }}
items:
- key: {{ template "gitlab.gitaly.authToken.key" . }}
path: gitaly/gitaly_token
- secret:
name: {{ template "gitlab.redis.password.secret" . }}
items:
......
......@@ -27,16 +27,13 @@ data:
# Redis (single instance)
url: {{ template "gitlab.redis.scheme" . }}://:<%= File.read("/etc/gitlab/redis/password") %>@{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }}
id:
gitlab.yml: |
gitlab.yml.erb: |
production: &base
gitlab:
repositories:
storages:
default:
path: /var/opt/gitlab/repo
gitaly_address: tcp://localhost:8075
{{ include "gitlab.appConfig.gitaly" . | indent 6 }}
{{ include "gitlab.appConfig.repositories" . | indent 6 }}
configure: |
{{- include "gitlab.scripts.configure.secrets" (dict "required" "redis postgres rails-secrets migrations" ) | nindent 4 -}}
{{- include "gitlab.scripts.configure.secrets" (dict "required" "redis postgres rails-secrets migrations gitaly" "optional" "nil") | nindent 4 -}}
{{- include "gitlab.psql.ssl.initScript" . | nindent 4 }}
{{- if .Values.global.operator.enabled }}
---
......
......@@ -18,6 +18,13 @@ enabled: true
initialRootPassword: {}
redis:
password: {}
gitaly:
# host: '0.0.0.0'
# port: 8075
# serviceName: 'gitaly'
authToken: {}
# secret: gitaly-secret
# key: token
global:
# imagePullPolicy: IfNotPresent
psql: {}
......@@ -35,6 +42,11 @@ global:
# serverCA: server-ca.pem
redis:
password: {}
gitaly:
internal:
names: ["default"]
external: []
authToken: {}
resources:
requests:
cpu: 50m
......
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