fix GITLAB_AGENT_BUILTIN_KAS_ENABLED == false

Author: th-2021

assets/runtime/env-defaults

@@ -693,3 +693,4 @@ GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE=${GITLAB_AGENT_KAS_API_LI
 GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE=${GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE:-${GITLAB_INSTALL_DIR}/.gitlab_kas_private_api_secret}
 GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE=${GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE:-${GITLAB_INSTALL_DIR}/.gitlab_kas_websocket_token_secret}
 GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE=${GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE:-}
+GITLAB_AGENT_BUILTIN_KAS_ENABLED=${GITLAB_AGENT_BUILTIN_KAS_ENABLED:-false}

assets/runtime/functions

@@ -375,15 +375,17 @@ gitlab_configure_gitlab_kas() {
     GITLAB_KAS_PROXY
 
   printf "Configuring gitlab-agent::KAS (enabled: %s)\n" "${GITLAB_AGENT_BUILTIN_KAS_ENABLED}"
-  update_template ${GITLAB_KAS_CONFIG} \
-    GITLAB_RELATIVE_URL_ROOT \
-    GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE \
-    GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE \
-    GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE \
-    REDIS_HOST \
-    REDIS_PORT \
-    GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE
-  
+  if [[ ${GITLAB_AGENT_BUILTIN_KAS_ENABLED} == true ]]; then
+    update_template ${GITLAB_KAS_CONFIG} \
+      GITLAB_RELATIVE_URL_ROOT \
+      GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE \
+      GITLAB_AGENT_KAS_PRIVATE_API_LISTEN_AUTHENTICATION_SECRET_FILE \
+      GITLAB_AGENT_KAS_WEBSOCKET_TOKEN_SECRET_FILE \
+      REDIS_HOST \
+      REDIS_PORT \
+      GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE
+  fi
+
   if [[ -n ${GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE} ]]; then
     exec_as_git touch "${GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE}"
     exec_as_git chmod 600 "${GITLAB_AGENT_KAS_REDIS_PASSWORD_FILE}"
@@ -963,7 +965,7 @@ gitlab_configure_secrets() {
     chmod 600 "${pages_secret}"
   fi
 
-  if [[ ! -f "${GITLAB_AGENT_kas_aPI_LISTEN_AUTHENTICATION_SECRET_FILE}" ]]; then
+  if [[ ! -f "${GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE}" ]]; then
     exec_as_git openssl rand -base64 -out "${GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE}" 32
     chmod 600 ${GITLAB_AGENT_KAS_API_LISTEN_AUTHENTICATION_SECRET_FILE}
   fi