Merge branch 'fix-416803-bad-gateway-on-large-artifacts' into 'master'

Don't 500 when pages tries to serve a chunked file

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Reviewed-by: Dan <[email protected]>
Co-authored-by: Dan <[email protected]>
Co-authored-by: Dan <[email protected]>

Author: 3 people

doc/settings/nginx.md

@@ -334,6 +334,7 @@ This inserts the defined string into the end of the `server` block of
 
   ```conf
   proxy_cache off;
+  proxy_http_version 1.1;
   proxy_pass http://gitlab-workhorse;
   ```
 
@@ -533,6 +534,7 @@ server {
     proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
     proxy_set_header    X-Forwarded-Proto   $scheme;
 
+    proxy_http_version 1.1;
     proxy_pass http://gitlab-workhorse;
 
     ## The following settings only work with NGINX 1.7.11 or newer
@@ -556,6 +558,7 @@ server {
 
   ## To access Grafana
   location /-/grafana/ {
+    proxy_http_version 1.1;
     proxy_pass http://localhost:3000/;
   }
 

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-health.conf.erb

@@ -15,6 +15,7 @@ location /error.json  {
 <% @monitoring_addresses.each do |address| %>
 location = <%= File.join(@path, address[:url]) %> {
   proxy_cache off;
+  proxy_http_version 1.1;
   proxy_pass  http://gitlab-workhorse;
   error_page 404 500 502 /error.<%= address[:format] %>;
 }

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb

@@ -130,6 +130,7 @@ server { ## HTTPS server
     proxy_connect_timeout 90;
     proxy_send_timeout 300;
     proxy_read_timeout <%= @proxy_read_timeout %>;
+    proxy_http_version 1.1;
 
     proxy_pass http://gitlab_mattermost;
   }
@@ -157,6 +158,7 @@ server { ## HTTPS server
     <% next if header[1].nil? %>
     proxy_set_header <%= header[0] %> <%= header[1] %>;
     <% end %>
+    proxy_http_version 1.1;
 
     proxy_pass http://gitlab_mattermost;
   }

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-pages-http.conf.erb

@@ -111,6 +111,7 @@ server {
       proxy_buffer_size <%= @proxy_custom_buffer_size %>;
     <% end -%>
 
+    proxy_http_version 1.1;
     proxy_pass          http://<%= @pages_listen_proxy %>;
   }
 

files/gitlab-cookbooks/gitlab/templates/default/nginx-status.conf.erb

@@ -37,6 +37,7 @@ server  {
 
     location /rails-metrics {
       proxy_cache off;
+      proxy_http_version 1.1;
       proxy_pass  http://gitlab-workhorse/-/metrics;
     <% @options.each do |key, value|
       if value.is_a?(String) -%>

spec/chef/cookbooks/gitlab/recipes/nginx_spec.rb

@@ -418,6 +418,16 @@
         end
       end
     end
+
+    # Required to allow chunked encoding responses as of nginx 1.23
+    # https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7006
+    it 'sets proxy_http_version 1.1 when proxy_pass is used' do
+      http_conf.each_value do |conf|
+        expect(chef_run).to render_file(conf).with_content { |content|
+          expect(content).to include('proxy_http_version 1.1;') if content.include?('proxy_pass')
+        }
+      end
+    end
   end
 
   context 'when is enabled' do
@@ -565,6 +575,7 @@
       expect(chef_run).to render_file(http_conf['gitlab']).with_content { |content|
         expect(content).to include('location /-/grafana/ {')
         expect(content).to include('proxy_pass http://localhost:3000/;')
+        expect(content).to include('proxy_http_version 1.1;')
       }
     end
   end
@@ -580,6 +591,7 @@
       expect(chef_run).to render_file(http_conf['gitlab']).with_content { |content|
         expect(content).to include('location = /-/kubernetes-agent/ {')
         expect(content).to include('proxy_pass http://localhost:8150/;')
+        expect(content).to include('proxy_http_version 1.1;')
 
         expect(content).to include('location /-/kubernetes-agent/k8s-proxy/ {')
         expect(content).to include('proxy_pass http://localhost:8154/;')
@@ -601,6 +613,7 @@
         expect(chef_run).to render_file(http_conf['gitlab']).with_content { |content|
           expect(content).to include('location = /-/kubernetes-agent/ {')
           expect(content).to include('proxy_pass http://localhost:8150/;')
+          expect(content).to include('proxy_http_version 1.1;')
 
           expect(content).to include('location /-/kubernetes-agent/k8s-proxy/ {')
           expect(content).to include('proxy_pass http://localhost:8154/;')
@@ -614,6 +627,7 @@
 
           expect(content).to include('proxy_http_version 1.1;')
           expect(content).to include('proxy_pass http://localhost:8150/;')
+          expect(content).to include('proxy_http_version 1.1;')
 
           expect(content).to include('location /k8s-proxy/ {')
           expect(content).to include('location = /k8s-proxy/ {')