X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/79c3a619453df42b1177f92a442700906ff13c64..HEAD:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6e6c5298e4..7b63ca0ed7 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
@@ -150,17 +151,15 @@ type Cluster struct {
 		BalanceCollectionBuffers int
 		BalanceTimeout           Duration
 		BalanceUpdateLimit       int
+		BalancePullLimit         int
+		BalanceTrashLimit        int
 
 		WebDAVCache WebDAVCacheConfig
 
 		KeepproxyPermission UploadDownloadRolePermissions
 		WebDAVPermission    UploadDownloadRolePermissions
 		WebDAVLogEvents     bool
-	}
-	Git struct {
-		GitCommand   string
-		GitoliteHome string
-		Repositories string
+		WebDAVOutputBuffer  ByteSize
 	}
 	Login struct {
 		LDAP struct {
@@ -244,7 +243,6 @@ type Cluster struct {
 		AutoAdminFirstUser                    bool
 		AutoAdminUserWithEmail                string
 		AutoSetupNewUsers                     bool
-		AutoSetupNewUsersWithRepository       bool
 		AutoSetupNewUsersWithVmUUID           string
 		AutoSetupUsernameBlacklist            StringSet
 		EmailSubjectPrefix                    string
@@ -269,31 +267,15 @@ type Cluster struct {
 	StorageClasses map[string]StorageClassConfig
 	Volumes        map[string]Volume
 	Workbench      struct {
-		ActivationContactLink            string
-		APIClientConnectTimeout          Duration
-		APIClientReceiveTimeout          Duration
-		APIResponseCompression           bool
-		ApplicationMimetypesWithViewIcon StringSet
-		ArvadosDocsite                   string
-		ArvadosPublicDataDocURL          string
-		DefaultOpenIdPrefix              string
-		DisableSharingURLsUI             bool
-		EnableGettingStartedPopup        bool
-		EnablePublicProjectsPage         bool
-		FileViewersConfigURL             string
-		LogViewerMaxBytes                ByteSize
-		MultiSiteSearch                  string
-		ProfilingEnabled                 bool
-		Repositories                     bool
-		RepositoryCache                  string
-		RunningJobLogRecordsToFetch      int
-		SecretKeyBase                    string
-		ShowRecentCollectionsOnDashboard bool
-		ShowUserAgreementInline          bool
-		ShowUserNotifications            bool
-		SiteName                         string
-		Theme                            string
-		UserProfileFormFields            map[string]struct {
+		ActivationContactLink   string
+		ArvadosDocsite          string
+		ArvadosPublicDataDocURL string
+		DisableSharingURLsUI    bool
+		FileViewersConfigURL    string
+		ShowUserAgreementInline bool
+		SiteName                string
+		Theme                   string
+		UserProfileFormFields   map[string]struct {
 			Type                 string
 			FormFieldTitle       string
 			FormFieldDescription string
@@ -317,16 +299,16 @@ type StorageClassConfig struct {
 }
 
 type Volume struct {
-	AccessViaHosts   map[URL]VolumeAccess
-	ReadOnly         bool
-	Replication      int
-	StorageClasses   map[string]bool
-	Driver           string
-	DriverParameters json.RawMessage
+	AccessViaHosts         map[URL]VolumeAccess
+	ReadOnly               bool
+	AllowTrashWhenReadOnly bool
+	Replication            int
+	StorageClasses         map[string]bool
+	Driver                 string
+	DriverParameters       json.RawMessage
 }
 
 type S3VolumeDriverParameters struct {
-	IAMRole            string
 	AccessKeyID        string
 	SecretAccessKey    string
 	Endpoint           string
@@ -367,8 +349,6 @@ type Services struct {
 	DispatchCloud  Service
 	DispatchLSF    Service
 	DispatchSLURM  Service
-	GitHTTP        Service
-	GitSSH         Service
 	Health         Service
 	Keepbalance    Service
 	Keepproxy      Service
@@ -516,26 +496,17 @@ type ContainersConfig struct {
 	SupportedDockerImageFormats   StringSet
 	AlwaysUsePreemptibleInstances bool
 	PreemptiblePriceFactor        float64
+	MaximumPriceFactor            float64
 	RuntimeEngine                 string
 	LocalKeepBlobBuffersPerVCPU   int
 	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
@@ -545,20 +516,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
 	}
 }
 
@@ -678,7 +642,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"
@@ -698,7 +661,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,