Commit 5f3b6980 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason Committed by Thong Kuah

Add internal and external URL config for KAS

See https://gitlab.com/gitlab-org/gitlab/-/issues/299850
parent 01231757
---
title: Add internal and external URL config for KAS
merge_request: 54260
author:
type: added
...@@ -1159,10 +1159,17 @@ production: &base ...@@ -1159,10 +1159,17 @@ production: &base
# secret_file: /home/git/gitlab/.gitlab_workhorse_secret # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
gitlab_kas: gitlab_kas:
# enabled: true
# File that contains the secret key for verifying access for gitlab-kas. # File that contains the secret key for verifying access for gitlab-kas.
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
# secret_file: /home/git/gitlab/.gitlab_kas_secret # secret_file: /home/git/gitlab/.gitlab_kas_secret
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
# The URL to the internal KAS API (used by the GitLab backend)
# internal_url: grpc://localhost:8153
## GitLab Elasticsearch settings ## GitLab Elasticsearch settings
elasticsearch: elasticsearch:
indexer_path: /home/git/gitlab-elasticsearch-indexer/ indexer_path: /home/git/gitlab-elasticsearch-indexer/
......
...@@ -710,7 +710,10 @@ Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret' ...@@ -710,7 +710,10 @@ Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret'
# GitLab KAS # GitLab KAS
# #
Settings['gitlab_kas'] ||= Settingslogic.new({}) Settings['gitlab_kas'] ||= Settingslogic.new({})
Settings.gitlab_kas['enabled'] ||= false
Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret') Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret')
Settings.gitlab_kas['external_url'] ||= 'wss://kas.example.com'
Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153'
# #
# Repositories # Repositories
......
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