Skip to content

Commit 5d1827b

Browse files
committed
Tweak kas config order in gitlab.yml
sync with upstream
1 parent 5af9e6f commit 5d1827b

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

assets/runtime/config/gitlabhq/gitlab.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,22 @@ production: &base
11741174
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
11751175
# secret_file: /home/git/gitlab/.gitlab_workhorse_secret
11761176

1177+
gitlab_kas:
1178+
enabled: {{GITLAB_KAS_ENABLED}}
1179+
# File that contains the secret key for verifying access for gitlab-kas.
1180+
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
1181+
secret_file: {{GITLAB_KAS_SECRET}} # /home/git/gitlab/.gitlab_kas_secret
1182+
1183+
# The URL to the external KAS API (used by the Kubernetes agents)
1184+
external_url: {{GITLAB_KAS_EXTERNAL}} # wss://kas.example.com
1185+
1186+
# The URL to the internal KAS API (used by the GitLab backend)
1187+
internal_url: {{GITLAB_KAS_INTERNAL}} # grpc://localhost:8153
1188+
1189+
# The URL to the Kubernetes API proxy (used by GitLab users)
1190+
external_k8s_proxy_url: {{GITLAB_KAS_PROXY}} # https://localhost:8154 # default: nil
1191+
1192+
11771193
## GitLab Elasticsearch settings
11781194
elasticsearch:
11791195
indexer_path: {{GITLAB_HOME}}/gitlab-elasticsearch-indexer/
@@ -1271,22 +1287,6 @@ production: &base
12711287
# Ban an IP for one hour (3600s) after too many auth attempts
12721288
bantime: {{RACK_ATTACK_BANTIME}}
12731289

1274-
gitlab_kas:
1275-
enabled: {{GITLAB_KAS_ENABLED}}
1276-
# File that contains the secret key for verifying access for gitlab-kas.
1277-
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
1278-
secret_file: {{GITLAB_KAS_SECRET}} # /home/git/gitlab/.gitlab_kas_secret
1279-
1280-
# The URL to the external KAS API (used by the Kubernetes agents)
1281-
external_url: {{GITLAB_KAS_EXTERNAL}} # wss://kas.example.com
1282-
1283-
# The URL to the internal KAS API (used by the GitLab backend)
1284-
internal_url: {{GITLAB_KAS_INTERNAL}} # grpc://localhost:8153
1285-
1286-
# The URL to the Kubernetes API proxy (used by GitLab users)
1287-
external_k8s_proxy_url: {{GITLAB_KAS_PROXY}} # https://localhost:8154 # default: nil
1288-
1289-
12901290
development:
12911291
<<: *base
12921292

0 commit comments

Comments
 (0)