18874: Merge commit '6f8dcb2b13f3058db656908fb26b09e23b527f08' into 18874-merge-wb2

[arvados.git] / sdk / go / arvados / config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 76ed7cefba28bf9771349c23c3d983ebea245667..a3e54952da483c46a87416b200291bc65b66304b 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -100,6 +100,9 @@ type Cluster struct {
                MaxIndexDatabaseRead             int
                MaxItemsPerResponse              int
                MaxConcurrentRequests            int
+               MaxQueuedRequests                int
+               MaxQueueTimeForLockRequests      Duration
+               LogCreateRequestFraction         float64
                MaxKeepBlobBuffers               int
                MaxRequestAmplification          int
                MaxRequestSize                   int
@@ -220,9 +223,10 @@ type Cluster struct {
                EmailFrom                      string
        }
        SystemLogs struct {
-               LogLevel                string
-               Format                  string
-               MaxRequestLogParamsSize int
+               LogLevel                  string
+               Format                    string
+               MaxRequestLogParamsSize   int
+               RequestQueueDumpDirectory string
        }
        TLS struct {
                Certificate string
@@ -254,6 +258,12 @@ type Cluster struct {
                RoleGroupsVisibleToAll                bool
                CanCreateRoleGroups                   bool
                ActivityLoggingPeriod                 Duration
+               SyncIgnoredGroups                     []string
+               SyncRequiredGroups                    []string
+               SyncUserAccounts                      bool
+               SyncUserAPITokens                     bool
+               SyncUserGroups                        bool
+               SyncUserSSHKeys                       bool
        }
        StorageClasses map[string]StorageClassConfig
        Volumes        map[string]Volume
@@ -296,7 +306,7 @@ type Cluster struct {
                SSHHelpPageHTML        string
                SSHHelpHostSuffix      string
                IdleTimeout            Duration
-               BannerURL              string
+               BannerUUID             string
        }
 }
 
@@ -323,7 +333,6 @@ type S3VolumeDriverParameters struct {
        Bucket             string
        LocationConstraint bool
        V2Signature        bool
-       UseAWSS3v2Driver   bool
        IndexPageSize      int
        ConnectTimeout     Duration
        ReadTimeout        Duration
@@ -498,7 +507,6 @@ type ContainersConfig struct {
        DefaultKeepCacheRAM           ByteSize
        DispatchPrivateKey            string
        LogReuseDecisions             bool
-       MaxComputeVMs                 int
        MaxDispatchAttempts           int
        MaxRetryAttempts              int
        MinRetryPeriod                Duration
@@ -557,11 +565,16 @@ type CloudVMsConfig struct {
        Enable bool
 
        BootProbeCommand               string
+       InstanceInitCommand            string
        DeployRunnerBinary             string
+       DeployPublicKey                bool
        ImageID                        string
        MaxCloudOpsPerSecond           int
        MaxProbesPerSecond             int
        MaxConcurrentInstanceCreateOps int
+       MaxInstances                   int
+       InitialQuotaEstimate           int
+       SupervisorFraction             float64
        PollInterval                   Duration
        ProbeInterval                  Duration
        SSHPort                        string