Skip to content

Commit c6fc000

Browse files
committed
Tweak kas config order in gitlab.yml
sync with upstream
1 parent 972e6da commit c6fc000

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
@@ -1173,6 +1173,22 @@ production: &base
11731173
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
11741174
# secret_file: /home/git/gitlab/.gitlab_workhorse_secret
11751175

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

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

0 commit comments

Comments
 (0)