Skip to content

Commit 37169ff

Browse files
th-2021kkimurak
authored andcommitted
KAS: fix CORS issue by setting gitlab.external_url
1 parent 75055d3 commit 37169ff

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

assets/runtime/config/gitlab-agent/gitlab-kas_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ gitaly:
5151
refill_rate_per_second: 15
5252
gitlab:
5353
address: http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
54+
external_url: {{GITLAB_SCHEME}}://{{GITLAB_HOST}}
5455
authentication_secret_file: {{GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE}} # required
5556
api_rate_limit:
5657
bucket_size: 250

assets/runtime/functions

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,14 @@ gitlab_configure_gitlab_kas() {
401401

402402
printf "Configuring gitlab-agent::KAS (enabled: %s)\n" "${GITLAB_AGENT_BUILTIN_KAS_ENABLED}"
403403
if [[ ${GITLAB_AGENT_BUILTIN_KAS_ENABLED} == true ]]; then
404+
if [[ "${GITLAB_HTTPS}" == true ]]; then
405+
GITLAB_SCHEME=https
406+
else
407+
GITLAB_SCHEME=http
408+
fi
404409
update_template ${GITLAB_KAS_CONFIG} \
410+
GITLAB_SCHEME \
411+
GITLAB_HOST \
405412
GITLAB_RELATIVE_URL_ROOT \
406413
GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE \
407414
GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE \

0 commit comments

Comments
 (0)