Fix assignment for GITLAB_KAS_SECRET

User still only required to set
`GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE`
as `GITLAB_KAS_SECRET` finally default to
`GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE`
(over `GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE`)

Author: kkimurak

README.md

@@ -1344,7 +1344,7 @@ Enable/Disable GitLab agent server for Kubernetes (KAS). See details on [officia
 
 ##### `GITLAB_KAS_SECRET`
 
-File that contains the secret key for verifying access for GitLab KAS. Defaults to `${GITLAB_INSTALL_DIR}/.gitlab_kas_secret`
+File that contains the secret key for verifying access for GitLab KAS. This value will be used for `production.gitlab_kas.secret_file` in gitlab.yml. Defaults to `${GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE}`
 
 ##### `GITLAB_KAS_EXTERNAL`
 

assets/runtime/config/gitlabhq/gitlab.yml

@@ -1222,7 +1222,7 @@ production: &base
     enabled: {{GITLAB_KAS_ENABLED}}
     # 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: {{GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE}} # /home/git/gitlab/.gitlab_kas_secret
+    secret_file: {{GITLAB_KAS_SECRET}} # /home/git/gitlab/.gitlab_kas_secret
 
     # The URL to the external KAS API (used by the Kubernetes agents)
     external_url: {{GITLAB_KAS_EXTERNAL}} # wss://kas.example.com

assets/runtime/env-defaults

@@ -708,3 +708,5 @@ GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE=${GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_
 GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE=${GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE:-}
 GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE=${GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE:-${GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE}}
 GITLAB_AGENT_BUILTIN_KAS_ENABLED=${GITLAB_AGENT_BUILTIN_KAS_ENABLED:-false}
+
+GITLAB_KAS_SECRET=${GITLAB_KAS_SECRET:-${GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE}}

assets/runtime/functions

@@ -396,7 +396,7 @@ gitlab_configure_gitlab_kas() {
     GITLAB_KAS_ENABLED \
     GITLAB_KAS_EXTERNAL \
     GITLAB_KAS_INTERNAL \
-    GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE \
+    GITLAB_KAS_SECRET \
     GITLAB_KAS_PROXY
 
   printf "Configuring gitlab-agent::KAS (enabled: %s)\n" "${GITLAB_AGENT_BUILTIN_KAS_ENABLED}"
@@ -406,6 +406,7 @@ gitlab_configure_gitlab_kas() {
       GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE \
       GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE \
       GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE \
+      GITLAB_AGENT_KAS_GITLAB_AUTHENTICATION_SECRET_FILE \
       REDIS_HOST \
       REDIS_PORT \
       GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE