X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/75aee7b3d5b6c8e84e25e71eefe88040d8a12022..da5858d5f794c14cf00b830166bb34b1bcd79ba5:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6301ed047a..6725611fd0 100644
--- 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
 }
 
@@ -102,6 +102,7 @@ type Cluster struct {
 		MaxConcurrentRailsRequests       int
 		MaxConcurrentRequests            int
 		MaxQueuedRequests                int
+		MaxGatewayTunnels                int
 		MaxQueueTimeForLockRequests      Duration
 		LogCreateRequestFraction         float64
 		MaxKeepBlobBuffers               int
@@ -158,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 {
@@ -246,7 +243,6 @@ type Cluster struct {
 		AutoAdminFirstUser                    bool
 		AutoAdminUserWithEmail                string
 		AutoSetupNewUsers                     bool
-		AutoSetupNewUsersWithRepository       bool
 		AutoSetupNewUsersWithVmUUID           string
 		AutoSetupUsernameBlacklist            StringSet
 		EmailSubjectPrefix                    string
@@ -354,8 +350,6 @@ type Services struct {
 	DispatchCloud  Service
 	DispatchLSF    Service
 	DispatchSLURM  Service
-	GitHTTP        Service
-	GitSSH         Service
 	Health         Service
 	Keepbalance    Service
 	Keepproxy      Service
@@ -509,8 +503,7 @@ type ContainersConfig struct {
 	LocalKeepLogsToContainerLog   string
 
 	JobsAPI struct {
-		Enable         string
-		GitInternalDir string
+		Enable string
 	}
 	Logging struct {
 		MaxAge                       Duration
@@ -533,20 +526,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
 	}
 }
 
@@ -666,7 +652,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"
@@ -686,7 +671,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,