18947: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc build/run-build-packages.sh
Simple merge

diff --cc doc/admin/upgrading.html.textile.liquid
index 25cb26b40d707fb2db194d4ad013606031c6a7f3,efce633e9e1e4b4a5ae9263afba9969a230f4593..3f6009a803f2e535e8e6cf23edc8d6f7e93f9b76
--- 1/doc/admin/upgrading.html.textile.liquid
--- 2/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@@ -32,10 -32,19 +32,23 @@@ h2(#main). development main (as of 2022
  
  "previous: Upgrading to 2.4.0":#v2_4_0
  
 +h3. Slurm dispatcher requires configuration update
 +
 +If you use the Slurm dispatcher (@crunch-dispatch-slurm@) you must add a @Services.DispatchSLURM.InternalURLs@ section to your configuration file, as shown on the "updated install page":{{site.baseurl}}/install/crunch2-slurm/install-dispatch.html.
 +
+ h3. New proxy parameters for arvados-controller
+ 
+ We now recommend disabling nginx proxy caching for arvados-controller, to avoid truncation of large responses.
+ 
+ In your Nginx configuration file (@/etc/nginx/conf.d/arvados-api-and-controller.conf@), add the following lines to the @location /@ block with @http://controller@ (see "Update nginx configuration":{{site.baseurl}}/install/install-api-server.html#update-nginx for an example) and reload/restart Nginx (@sudo nginx -s reload@).
+ 
+ <pre>
+     proxy_max_temp_file_size 0;
+     proxy_request_buffering  off;
+     proxy_buffering          off;
+     proxy_http_version       1.1;
+ </pre>
+ 
  h3. Now recommending Singularity 3.9.9
  
  The compute image "build script":{{site.baseurl}}/install/crunch2-cloud/install-compute-node.html now installs Singularity 3.9.9 instead of 3.7.4. The newer version includes a bugfix that should resolve "intermittent loopback device errors":https://dev.arvados.org/issues/18489 when running containers.

diff --cc sdk/go/arvados/config.go
Simple merge

diff --cc sdk/go/health/aggregator_test.go
Simple merge