Skip to content

Commit ea62d4b

Browse files
committed
Tweak kas config order in gitlab.yml
sync with upstream
1 parent 8dde024 commit ea62d4b

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

1221+
gitlab_kas:
1222+
enabled: {{GITLAB_KAS_ENABLED}}
1223+
# File that contains the secret key for verifying access for gitlab-kas.
1224+
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
1225+
secret_file: {{GITLAB_KAS_SECRET}} # /home/git/gitlab/.gitlab_kas_secret
1226+
1227+
# The URL to the external KAS API (used by the Kubernetes agents)
1228+
external_url: {{GITLAB_KAS_EXTERNAL}} # wss://kas.example.com
1229+
1230+
# The URL to the internal KAS API (used by the GitLab backend)
1231+
internal_url: {{GITLAB_KAS_INTERNAL}} # grpc://localhost:8153
1232+
1233+
# The URL to the Kubernetes API proxy (used by GitLab users)
1234+
external_k8s_proxy_url: {{GITLAB_KAS_PROXY}} # https://localhost:8154 # default: nil
1235+
1236+
12211237
## GitLab Elasticsearch settings
12221238
elasticsearch:
12231239
indexer_path: {{GITLAB_HOME}}/gitlab-elasticsearch-indexer/
@@ -1315,22 +1331,6 @@ production: &base
13151331
# Ban an IP for one hour (3600s) after too many auth attempts
13161332
bantime: {{RACK_ATTACK_BANTIME}}
13171333

1318-
gitlab_kas:
1319-
enabled: {{GITLAB_KAS_ENABLED}}
1320-
# File that contains the secret key for verifying access for gitlab-kas.
1321-
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
1322-
secret_file: {{GITLAB_KAS_SECRET}} # /home/git/gitlab/.gitlab_kas_secret
1323-
1324-
# The URL to the external KAS API (used by the Kubernetes agents)
1325-
external_url: {{GITLAB_KAS_EXTERNAL}} # wss://kas.example.com
1326-
1327-
# The URL to the internal KAS API (used by the GitLab backend)
1328-
internal_url: {{GITLAB_KAS_INTERNAL}} # grpc://localhost:8153
1329-
1330-
# The URL to the Kubernetes API proxy (used by GitLab users)
1331-
external_k8s_proxy_url: {{GITLAB_KAS_PROXY}} # https://localhost:8154 # default: nil
1332-
1333-
13341334
development:
13351335
<<: *base
13361336

0 commit comments

Comments
 (0)