Merge branch '18562-preemptible'

fixes #18562

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

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/export.go
index e67ac9ce051d53ed91e6190b8c04399e27587725,9fe7d6cf27537442497fbf10debe3d392f379692..4e903a8b3d39398b80faf08199b77d9f146165b6
--- 1/lib/config/export.go
--- 2/lib/config/export.go
+++ b/lib/config/export.go
@@@ -59,98 -59,97 +59,99 @@@ func ExportJSON(w io.Writer, cluster *a
  // exists.
  var whitelist = map[string]bool{
        // | sort -t'"' -k2,2
-       "API":                                                 true,
-       "API.AsyncPermissionsUpdateInterval":                  false,
-       "API.DisabledAPIs":                                    false,
-       "API.KeepServiceRequestTimeout":                       false,
-       "API.MaxConcurrentRequests":                           false,
-       "API.MaxIndexDatabaseRead":                            false,
-       "API.MaxItemsPerResponse":                             true,
-       "API.MaxKeepBlobBuffers":                              false,
-       "API.MaxRequestAmplification":                         false,
-       "API.MaxRequestSize":                                  true,
-       "API.MaxTokenLifetime":                                false,
-       "API.RequestTimeout":                                  true,
-       "API.SendTimeout":                                     true,
-       "API.VocabularyPath":                                  false,
-       "API.WebsocketClientEventQueue":                       false,
-       "API.WebsocketServerEventQueue":                       false,
-       "AuditLogs":                                           false,
-       "AuditLogs.MaxAge":                                    false,
-       "AuditLogs.MaxDeleteBatch":                            false,
-       "AuditLogs.UnloggedAttributes":                        false,
-       "ClusterID":                                           true,
-       "Collections":                                         true,
-       "Collections.BalanceCollectionBatch":                  false,
-       "Collections.BalanceCollectionBuffers":                false,
-       "Collections.BalancePeriod":                           false,
-       "Collections.BalanceTimeout":                          false,
-       "Collections.BalanceUpdateLimit":                      false,
-       "Collections.BlobDeleteConcurrency":                   false,
-       "Collections.BlobMissingReport":                       false,
-       "Collections.BlobReplicateConcurrency":                false,
-       "Collections.BlobSigning":                             true,
-       "Collections.BlobSigningKey":                          false,
-       "Collections.BlobSigningTTL":                          true,
-       "Collections.BlobTrash":                               false,
-       "Collections.BlobTrashCheckInterval":                  false,
-       "Collections.BlobTrashConcurrency":                    false,
-       "Collections.BlobTrashLifetime":                       false,
-       "Collections.CollectionVersioning":                    true,
-       "Collections.DefaultReplication":                      true,
-       "Collections.DefaultTrashLifetime":                    true,
-       "Collections.ForwardSlashNameSubstitution":            true,
-       "Collections.ManagedProperties":                       true,
-       "Collections.ManagedProperties.*":                     true,
-       "Collections.ManagedProperties.*.*":                   true,
-       "Collections.PreserveVersionIfIdle":                   true,
-       "Collections.S3FolderObjects":                         true,
-       "Collections.TrashSweepInterval":                      false,
-       "Collections.TrustAllContent":                         true,
-       "Collections.WebDAVCache":                             false,
-       "Collections.KeepproxyPermission":                     false,
-       "Collections.WebDAVPermission":                        false,
-       "Collections.WebDAVLogEvents":                         false,
-       "Containers":                                          true,
-       "Containers.CloudVMs":                                 false,
-       "Containers.CrunchRunArgumentsList":                   false,
-       "Containers.CrunchRunCommand":                         false,
-       "Containers.DefaultKeepCacheRAM":                      true,
-       "Containers.DispatchPrivateKey":                       false,
-       "Containers.JobsAPI":                                  true,
-       "Containers.JobsAPI.Enable":                           true,
-       "Containers.JobsAPI.GitInternalDir":                   false,
-       "Containers.LocalKeepBlobBuffersPerVCPU":              false,
-       "Containers.LocalKeepLogsToContainerLog":              false,
-       "Containers.Logging":                                  false,
-       "Containers.LogReuseDecisions":                        false,
-       "Containers.LSF":                                      false,
-       "Containers.MaxComputeVMs":                            false,
-       "Containers.MaxDispatchAttempts":                      false,
-       "Containers.MaxRetryAttempts":                         true,
-       "Containers.MinRetryPeriod":                           true,
-       "Containers.ReserveExtraRAM":                          true,
-       "Containers.RuntimeEngine":                            true,
-       "Containers.ShellAccess":                              true,
-       "Containers.ShellAccess.Admin":                        true,
-       "Containers.ShellAccess.User":                         true,
-       "Containers.SLURM":                                    false,
-       "Containers.StaleLockTimeout":                         false,
-       "Containers.SupportedDockerImageFormats":              true,
-       "Containers.SupportedDockerImageFormats.*":            true,
-       "Containers.UsePreemptibleInstances":                  true,
-       "Git":                                                 false,
-       "InstanceTypes":                                       true,
-       "InstanceTypes.*":                                     true,
-       "InstanceTypes.*.*":                                   true,
-       "InstanceTypes.*.*.*":                                 true,
-       "Login":                                               true,
-       "Login.Google":                                        true,
-       "Login.Google.AlternateEmailAddresses":                false,
+       "API":                                      true,
+       "API.AsyncPermissionsUpdateInterval":       false,
+       "API.DisabledAPIs":                         false,
+       "API.KeepServiceRequestTimeout":            false,
+       "API.MaxConcurrentRequests":                false,
+       "API.MaxIndexDatabaseRead":                 false,
+       "API.MaxItemsPerResponse":                  true,
+       "API.MaxKeepBlobBuffers":                   false,
+       "API.MaxRequestAmplification":              false,
+       "API.MaxRequestSize":                       true,
+       "API.MaxTokenLifetime":                     false,
+       "API.RequestTimeout":                       true,
+       "API.SendTimeout":                          true,
+       "API.VocabularyPath":                       false,
+       "API.WebsocketClientEventQueue":            false,
+       "API.WebsocketServerEventQueue":            false,
+       "AuditLogs":                                false,
+       "AuditLogs.MaxAge":                         false,
+       "AuditLogs.MaxDeleteBatch":                 false,
+       "AuditLogs.UnloggedAttributes":             false,
+       "ClusterID":                                true,
+       "Collections":                              true,
+       "Collections.BalanceCollectionBatch":       false,
+       "Collections.BalanceCollectionBuffers":     false,
+       "Collections.BalancePeriod":                false,
+       "Collections.BalanceTimeout":               false,
+       "Collections.BalanceUpdateLimit":           false,
+       "Collections.BlobDeleteConcurrency":        false,
+       "Collections.BlobMissingReport":            false,
+       "Collections.BlobReplicateConcurrency":     false,
+       "Collections.BlobSigning":                  true,
+       "Collections.BlobSigningKey":               false,
+       "Collections.BlobSigningTTL":               true,
+       "Collections.BlobTrash":                    false,
+       "Collections.BlobTrashCheckInterval":       false,
+       "Collections.BlobTrashConcurrency":         false,
+       "Collections.BlobTrashLifetime":            false,
+       "Collections.CollectionVersioning":         true,
+       "Collections.DefaultReplication":           true,
+       "Collections.DefaultTrashLifetime":         true,
+       "Collections.ForwardSlashNameSubstitution": true,
++      "Collections.KeepproxyPermission":          false,
+       "Collections.ManagedProperties":            true,
+       "Collections.ManagedProperties.*":          true,
+       "Collections.ManagedProperties.*.*":        true,
+       "Collections.PreserveVersionIfIdle":        true,
+       "Collections.S3FolderObjects":              true,
+       "Collections.TrashSweepInterval":           false,
+       "Collections.TrustAllContent":              true,
+       "Collections.WebDAVCache":                  false,
 -      "Collections.KeepproxyPermission":          false,
 -      "Collections.WebDAVPermission":             false,
+       "Collections.WebDAVLogEvents":              false,
++      "Collections.WebDAVPermission":             false,
+       "Containers":                               true,
++      "Containers.AlwaysUsePreemptibleInstances": true,
+       "Containers.CloudVMs":                      false,
+       "Containers.CrunchRunArgumentsList":        false,
+       "Containers.CrunchRunCommand":              false,
+       "Containers.DefaultKeepCacheRAM":           true,
+       "Containers.DispatchPrivateKey":            false,
+       "Containers.JobsAPI":                       true,
+       "Containers.JobsAPI.Enable":                true,
+       "Containers.JobsAPI.GitInternalDir":        false,
+       "Containers.LocalKeepBlobBuffersPerVCPU":   false,
+       "Containers.LocalKeepLogsToContainerLog":   false,
+       "Containers.Logging":                       false,
+       "Containers.LogReuseDecisions":             false,
+       "Containers.LSF":                           false,
+       "Containers.MaxComputeVMs":                 false,
+       "Containers.MaxDispatchAttempts":           false,
+       "Containers.MaxRetryAttempts":              true,
+       "Containers.MinRetryPeriod":                true,
+       "Containers.ReserveExtraRAM":               true,
+       "Containers.RuntimeEngine":                 true,
+       "Containers.ShellAccess":                   true,
+       "Containers.ShellAccess.Admin":             true,
+       "Containers.ShellAccess.User":              true,
+       "Containers.SLURM":                         false,
+       "Containers.StaleLockTimeout":              false,
+       "Containers.SupportedDockerImageFormats":   true,
+       "Containers.SupportedDockerImageFormats.*": true,
 -      "Containers.AlwaysUsePreemptibleInstances": true,
+       "Git":                                  false,
+       "InstanceTypes":                        true,
+       "InstanceTypes.*":                      true,
+       "InstanceTypes.*.*":                    true,
++      "InstanceTypes.*.*.*":                  true,
+       "Login":                                true,
+       "Login.Google":                         true,
+       "Login.Google.AlternateEmailAddresses": false,
        "Login.Google.AuthenticationRequestParameters":        false,
        "Login.Google.ClientID":                               false,
        "Login.Google.ClientSecret":                           false,
        "Login.Google.Enable":                                 true,
++      "Login.IssueTrustedTokens":                            false,
        "Login.LDAP":                                          true,
        "Login.LDAP.AppendDomain":                             false,
        "Login.LDAP.EmailAttribute":                           false,
@@@ -186,7 -185,7 +187,6 @@@
        "Login.Test.Enable":                                   true,
        "Login.Test.Users":                                    false,
        "Login.TokenLifetime":                                 false,
--      "Login.IssueTrustedTokens":                            false,
        "Login.TrustedClients":                                false,
        "Mail":                                                true,
        "Mail.EmailFrom":                                      false,
@@@ -231,11 -230,11 +231,11 @@@
        "Users.NewUserNotificationRecipients":                 false,
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
--      "Users.UserNotifierEmailFrom":                         false,
++      "Users.RoleGroupsVisibleToAll":                        false,
        "Users.UserNotifierEmailBcc":                          false,
++      "Users.UserNotifierEmailFrom":                         false,
        "Users.UserProfileNotificationAddress":                false,
        "Users.UserSetupMailText":                             false,
--      "Users.RoleGroupsVisibleToAll":                        false,
        "Volumes":                                             true,
        "Volumes.*":                                           true,
        "Volumes.*.*":                                         false,

diff --cc lib/config/uptodate.go
index 71bdba71076da6cac0a6e2e68002b527e91f328c,71bdba71076da6cac0a6e2e68002b527e91f328c..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/lib/config/uptodate.go
--- 2/lib/config/uptodate.go
+++ /dev/null
@@@ -1,7 -1,7 +1,0 @@@
--// Copyright (C) The Arvados Authors. All rights reserved.
--//
--// SPDX-License-Identifier: AGPL-3.0
--
--package config
--
--//go:generate go run generate.go

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

diff --cc services/api/app/models/container_request.rb
Simple merge

diff --cc services/api/test/fixtures/containers.yml
Simple merge