Merge branch 'fix-agent-tunnel-address-scheme' into 'master'

Use http(s) for the agent CI tunnel address

See merge request gitlab-org/gitlab!67386

lib/gitlab/kas.rb

@@ -41,7 +41,9 @@ module Gitlab
       end
 
       def tunnel_url
-        URI.join(external_url, K8S_PROXY_PATH).to_s
+        uri = URI.join(external_url, K8S_PROXY_PATH)
+        uri.scheme = uri.scheme.in?(%w(grpcs wss)) ? 'https' : 'http'
+        uri.to_s
       end
 
       # Return GitLab KAS internal_url

spec/lib/gitlab/kas_spec.rb

@@ -66,8 +66,34 @@ RSpec.describe Gitlab::Kas do
   end
 
   describe '.tunnel_url' do
-    it 'returns gitlab_kas external_url with proxy path appended' do
-      expect(described_class.tunnel_url).to eq(Gitlab.config.gitlab_kas.external_url + '/k8s-proxy')
+    before do
+      stub_config(gitlab_kas: { external_url: external_url })
+    end
+
+    subject { described_class.tunnel_url }
+
+    context 'external_url uses wss://' do
+      let(:external_url) { 'wss://kas.gitlab.example.com' }
+
+      it { is_expected.to eq('https://kas.gitlab.example.com/k8s-proxy') }
+    end
+
+    context 'external_url uses ws://' do
+      let(:external_url) { 'ws://kas.gitlab.example.com' }
+
+      it { is_expected.to eq('http://kas.gitlab.example.com/k8s-proxy') }
+    end
+
+    context 'external_url uses grpcs://' do
+      let(:external_url) { 'grpcs://kas.gitlab.example.com' }
+
+      it { is_expected.to eq('https://kas.gitlab.example.com/k8s-proxy') }
+    end
+
+    context 'external_url uses grpc://' do
+      let(:external_url) { 'grpc://kas.gitlab.example.com' }
+
+      it { is_expected.to eq('http://kas.gitlab.example.com/k8s-proxy') }
     end
   end