Merge branch 'main' into 19582-aws-s3v2-driver

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --combined doc/admin/upgrading.html.textile.liquid
index 40f7034c3238d1130f831e209f02732e72d77b4d,1fe6745b94ca643ef8eaf0eeba2e59c90bdd6823..5fbbda2aef1ac171eb1d743327be2ef33c7561c4
--- 1/doc/admin/upgrading.html.textile.liquid
--- 2/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@@ -29,13 -29,17 +29,22 @@@ TODO: extract this information based o
  </notextile>
  
  
- h2(#main). development main (as of 2022-10-13)
 -h2(#main). development main (as of 2022-10-14)
++h2(#main). development main (as of 2022-10-31)
  
  "previous: Upgrading to 2.4.3":#v2_4_3
  
 +h3. New keepstore S3 driver enabled by default
 +
 +A more actively maintained S3 client library is now enabled by default for keeepstore services. The previous driver is still available for use in case of unknown issues. To use the old driver, set @DriverParameters.UseAWSS3v2Driver@ to @false@ on the appropriate @Volumes@ config entries.
++h2(#main). development main (as of 2022-10-14)
++
+ h3. Old container logs are automatically deleted from PostgreSQL
+ 
+ Cached copies of log entries from containers that finished more than 1 month ago are now deleted automatically (this only affects the "live" logs saved in the PostgreSQL database, not log collections saved in Keep). If you have an existing cron job that runs @rake db:delete_old_container_logs@, you can remove it. See configuration options @Containers.Logging.MaxAge@ and @Containers.Logging.SweepInterval@.
+ 
+ h3. Fixed salt installer template file to support container shell access
+ 
+ If you manage your cluster using the salt installer, you may want to update it to the latest version, use the appropriate @config_examples@ subdirectory and re-reploy with your custom @local.params@ file so that the @arvados-controller@'s @nginx@ configuration file gets fixed.
  
  h3. Login-sync script requires configuration update on LoginCluster federations
  

diff --combined lib/config/config.default.yml
index ca54840fd4095c6247fdf3999c23bd9121565beb,559b57c8c4d5d4bf3fa0444628d880485f75daa6..5e46c290da6424f15870ac4bb6cf03731e21e338
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -1071,12 -1071,16 +1071,16 @@@ Clusters
        LocalKeepLogsToContainerLog: none
  
        Logging:
-         # When you run the db:delete_old_container_logs task, it will find
-         # containers that have been finished for at least this many seconds,
+         # Periodically (see SweepInterval) Arvados will check for
+         # containers that have been finished for at least this long,
          # and delete their stdout, stderr, arv-mount, crunch-run, and
          # crunchstat logs from the logs table.
          MaxAge: 720h
  
+         # How often to delete cached log entries for finished
+         # containers (see MaxAge).
+         SweepInterval: 12h
+ 
          # These two settings control how frequently log events are flushed to the
          # database.  Log lines are buffered until either crunch_log_bytes_per_event
          # has been reached or crunch_log_seconds_between_events has elapsed since
@@@ -1495,7 -1499,7 +1499,7 @@@
            RaceWindow: 24h
            PrefixLength: 0
            # Use aws-s3-go (v2) instead of goamz
 -          UseAWSS3v2Driver: false
 +          UseAWSS3v2Driver: true
  
            # For S3 driver, potentially unsafe tuning parameter,
            # intentionally excluded from main documentation.
@@@ -1716,6 -1720,10 +1720,10 @@@
        # This feature is disabled when set to zero.
        IdleTimeout: 0s
  
+       # URL to a file that is a fragment of text or HTML which should
+       # be rendered in Workbench as a banner.
+       BannerURL: ""
+ 
        # Workbench welcome screen, this is HTML text that will be
        # incorporated directly onto the page.
        WelcomePageHTML: |