Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5f3b6980
Commit
5f3b6980
authored
Feb 18, 2021
by
Hordur Freyr Yngvason
Committed by
Thong Kuah
Feb 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add internal and external URL config for KAS
See
https://gitlab.com/gitlab-org/gitlab/-/issues/299850
parent
01231757
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
changelogs/unreleased/add-kas-api-url-config.yml
changelogs/unreleased/add-kas-api-url-config.yml
+5
-0
config/gitlab.yml.example
config/gitlab.yml.example
+7
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-0
No files found.
changelogs/unreleased/add-kas-api-url-config.yml
0 → 100644
View file @
5f3b6980
---
title
:
Add internal and external URL config for KAS
merge_request
:
54260
author
:
type
:
added
config/gitlab.yml.example
View file @
5f3b6980
...
...
@@ -1159,10 +1159,17 @@ production: &base
# secret_file: /home/git/gitlab/.gitlab_workhorse_secret
gitlab_kas:
# enabled: true
# 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).
# 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
elasticsearch:
indexer_path: /home/git/gitlab-elasticsearch-indexer/
...
...
config/initializers/1_settings.rb
View file @
5f3b6980
...
...
@@ -710,7 +710,10 @@ Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret'
# GitLab KAS
#
Settings
[
'gitlab_kas'
]
||=
Settingslogic
.
new
({})
Settings
.
gitlab_kas
[
'enabled'
]
||=
false
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment