Merge branch 'support-tls-websocket-omnibus' into 'master'

Remove the outdated warning message for websocket TLS termination

Closes gitlab-org/cluster-integration/gitlab-agent#220

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7181

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Dustin Collins <[email protected]>
Approved-by: Mikhail Mazurskiy <[email protected]>
Approved-by: Hordur Freyr Yngvason <[email protected]>
Co-authored-by: Harshit Prasad <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab-kas/recipes/enable.rb

@@ -65,17 +65,6 @@
   recursive true
 end
 
-ruby_block 'websocket TLS termination' do
-  block do
-    message = [
-      "Enabling gitlab-kas API TLS termination and websocket tunnelling at the same time is not supported.",
-      "See <https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/issues/217>"
-    ]
-    LoggingHelper.warning(message.join("\n\n"))
-  end
-  only_if { node['gitlab_kas']['listen_websocket'] && node['gitlab_kas']['certificate_file'] && node['gitlab_kas']['key_file'] }
-end
-
 version_file 'Create version file for Gitlab KAS' do
   version_file_path File.join(working_dir, 'VERSION')
   version_check_cmd '/opt/gitlab/embedded/bin/gitlab-kas --version'

spec/chef/cookbooks/gitlab-kas/recipes/gitlab-kas_spec.rb

@@ -612,24 +612,6 @@
       end
     end
 
-    context 'when the certificate/key bundle is defined and websocket tunneling is enabled' do
-      before do
-        stub_gitlab_rb(
-          external_url: 'https://gitlab.example.com',
-          gitlab_kas: {
-            enable: true,
-            listen_websocket: true,
-            certificate_file: '/path/to/cert.pem',
-            key_file: '/path/to/key.pem',
-          }
-        )
-      end
-
-      it 'logs a warning' do
-        expect(chef_run).to run_ruby_block('websocket TLS termination')
-      end
-    end
-
     context 'log directory and runit group' do
       context 'default values' do
         it_behaves_like 'enabled logged service', 'gitlab-kas', true, { log_directory_owner: 'git' }