Merge branch '21535-multi-wf-delete'

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

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 16d789daf5163f49bc6fe4770565fcde9325fd35..8572613e9403288d8119604fe1dd69360158ca9b 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -63,8 +63,8 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 
 type WebDAVCacheConfig struct {
        TTL                Duration
-       MaxBlockEntries    int
-       MaxCollectionBytes int64
+       DiskCacheSize      ByteSizeOrPercent
+       MaxCollectionBytes ByteSize
        MaxSessions        int
 }
 
@@ -159,11 +159,7 @@ type Cluster struct {
                KeepproxyPermission UploadDownloadRolePermissions
                WebDAVPermission    UploadDownloadRolePermissions
                WebDAVLogEvents     bool
-       }
-       Git struct {
-               GitCommand   string
-               GitoliteHome string
-               Repositories string
+               WebDAVOutputBuffer  ByteSize
        }
        Login struct {
                LDAP struct {
@@ -247,7 +243,6 @@ type Cluster struct {
                AutoAdminFirstUser                    bool
                AutoAdminUserWithEmail                string
                AutoSetupNewUsers                     bool
-               AutoSetupNewUsersWithRepository       bool
                AutoSetupNewUsersWithVmUUID           string
                AutoSetupUsernameBlacklist            StringSet
                EmailSubjectPrefix                    string
@@ -355,8 +350,6 @@ type Services struct {
        DispatchCloud  Service
        DispatchLSF    Service
        DispatchSLURM  Service
-       GitHTTP        Service
-       GitSSH         Service
        Health         Service
        Keepbalance    Service
        Keepproxy      Service
@@ -510,21 +503,11 @@ type ContainersConfig struct {
        LocalKeepLogsToContainerLog   string
 
        JobsAPI struct {
-               Enable         string
-               GitInternalDir string
+               Enable string
        }
        Logging struct {
-               MaxAge                       Duration
-               SweepInterval                Duration
-               LogBytesPerEvent             int
-               LogSecondsBetweenEvents      Duration
-               LogThrottlePeriod            Duration
-               LogThrottleBytes             int
-               LogThrottleLines             int
-               LimitLogBytesPerJob          int
-               LogPartialLineThrottlePeriod Duration
-               LogUpdatePeriod              Duration
-               LogUpdateSize                ByteSize
+               LogUpdatePeriod Duration
+               LogUpdateSize   ByteSize
        }
        ShellAccess struct {
                Admin bool
@@ -534,20 +517,13 @@ type ContainersConfig struct {
                PrioritySpread             int64
                SbatchArgumentsList        []string
                SbatchEnvironmentVariables map[string]string
-               Managed                    struct {
-                       DNSServerConfDir       string
-                       DNSServerConfTemplate  string
-                       DNSServerReloadCommand string
-                       DNSServerUpdateCommand string
-                       ComputeNodeDomain      string
-                       ComputeNodeNameservers StringSet
-                       AssignNodeHostname     string
-               }
        }
        LSF struct {
-               BsubSudoUser      string
-               BsubArgumentsList []string
-               BsubCUDAArguments []string
+               BsubSudoUser       string
+               BsubArgumentsList  []string
+               BsubCUDAArguments  []string
+               MaxRunTimeOverhead Duration
+               MaxRunTimeDefault  Duration
        }
 }
 
@@ -667,7 +643,6 @@ const (
        ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
        ServiceNameDispatchLSF   ServiceName = "arvados-dispatch-lsf"
        ServiceNameDispatchSLURM ServiceName = "crunch-dispatch-slurm"
-       ServiceNameGitHTTP       ServiceName = "arvados-git-httpd"
        ServiceNameHealth        ServiceName = "arvados-health"
        ServiceNameKeepbalance   ServiceName = "keep-balance"
        ServiceNameKeepproxy     ServiceName = "keepproxy"
@@ -687,7 +662,6 @@ func (svcs Services) Map() map[ServiceName]Service {
                ServiceNameDispatchCloud: svcs.DispatchCloud,
                ServiceNameDispatchLSF:   svcs.DispatchLSF,
                ServiceNameDispatchSLURM: svcs.DispatchSLURM,
-               ServiceNameGitHTTP:       svcs.GitHTTP,
                ServiceNameHealth:        svcs.Health,
                ServiceNameKeepbalance:   svcs.Keepbalance,
                ServiceNameKeepproxy:     svcs.Keepproxy,