diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
| commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
| tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /lib/gitlab/kas.rb | |
| parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) | |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'lib/gitlab/kas.rb')
| -rw-r--r-- | lib/gitlab/kas.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/kas.rb b/lib/gitlab/kas.rb index 45582f19214..408b3afc128 100644 --- a/lib/gitlab/kas.rb +++ b/lib/gitlab/kas.rb @@ -41,6 +41,10 @@ module Gitlab end def tunnel_url + configured = Gitlab.config.gitlab_kas['external_k8s_proxy_url'] + return configured if configured.present? + + # Legacy code path. Will be removed when all distributions provide a sane default here uri = URI.join(external_url, K8S_PROXY_PATH) uri.scheme = uri.scheme.in?(%w(grpcs wss)) ? 'https' : 'http' uri.to_s |