projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16347: Add LocalKeepLogsToContainerLog config (none/errors/all).
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 8149b93965553304172353d0bf971ee3164cbf0e..e736f79fd7f2bcee24e449596b4950bd279881bc 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-63,11
+63,20
@@
type WebDAVCacheConfig struct {
MaxBlockEntries int
MaxCollectionEntries int
MaxCollectionBytes int64
MaxBlockEntries int
MaxCollectionEntries int
MaxCollectionBytes int64
- MaxPermissionEntries int
MaxUUIDEntries int
MaxSessions int
}
MaxUUIDEntries int
MaxSessions int
}
+type UploadDownloadPermission struct {
+ Upload bool
+ Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+ User UploadDownloadPermission
+ Admin UploadDownloadPermission
+}
+
type Cluster struct {
ClusterID string `json:"-"`
ManagementToken string
type Cluster struct {
ClusterID string `json:"-"`
ManagementToken string
@@
-128,8
+137,13
@@
type Cluster struct {
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
+ BalanceUpdateLimit int
WebDAVCache WebDAVCacheConfig
WebDAVCache WebDAVCacheConfig
+
+ KeepproxyPermission UploadDownloadRolePermissions
+ WebDAVPermission UploadDownloadRolePermissions
+ WebDAVLogEvents bool
}
Git struct {
GitCommand string
}
Git struct {
GitCommand string
@@
-176,11
+190,6
@@
type Cluster struct {
Service string
DefaultEmailDomain string
}
Service string
DefaultEmailDomain string
}
- SSO struct {
- Enable bool
- ProviderAppID string
- ProviderAppSecret string
- }
Test struct {
Enable bool
Users map[string]TestUser
Test struct {
Enable bool
Users map[string]TestUser
@@
-224,12
+233,14
@@
type Cluster struct {
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
+ UserNotifierEmailBcc StringSet
UserProfileNotificationAddress string
PreferDomainForUsername string
UserSetupMailText string
}
UserProfileNotificationAddress string
PreferDomainForUsername string
UserSetupMailText string
}
- Volumes map[string]Volume
- Workbench struct {
+ StorageClasses map[string]StorageClassConfig
+ Volumes map[string]Volume
+ Workbench struct {
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
@@
-271,6
+282,11
@@
type Cluster struct {
}
}
}
}
+type StorageClassConfig struct {
+ Default bool
+ Priority int
+}
+
type Volume struct {
AccessViaHosts map[URL]VolumeAccess
ReadOnly bool
type Volume struct {
AccessViaHosts map[URL]VolumeAccess
ReadOnly bool
@@
-295,6
+311,7
@@
type S3VolumeDriverParameters struct {
ReadTimeout Duration
RaceWindow Duration
UnsafeDelete bool
ReadTimeout Duration
RaceWindow Duration
UnsafeDelete bool
+ PrefixLength int
}
type AzureVolumeDriverParameters struct {
}
type AzureVolumeDriverParameters struct {
@@
-320,6
+337,7
@@
type Services struct {
Composer Service
Controller Service
DispatchCloud Service
Composer Service
Controller Service
DispatchCloud Service
+ DispatchLSF Service
GitHTTP Service
GitSSH Service
Health Service
GitHTTP Service
GitSSH Service
Health Service
@@
-327,7
+345,6
@@
type Services struct {
Keepproxy Service
Keepstore Service
RailsAPI Service
Keepproxy Service
Keepstore Service
RailsAPI Service
- SSO Service
WebDAVDownload Service
WebDAV Service
WebShell Service
WebDAVDownload Service
WebDAV Service
WebShell Service
@@
-417,6
+434,9
@@
type ContainersConfig struct {
StaleLockTimeout Duration
SupportedDockerImageFormats StringSet
UsePreemptibleInstances bool
StaleLockTimeout Duration
SupportedDockerImageFormats StringSet
UsePreemptibleInstances bool
+ RuntimeEngine string
+ LocalKeepBlobBuffersPerVCPU int
+ LocalKeepLogsToContainerLog string
JobsAPI struct {
Enable string
JobsAPI struct {
Enable string
@@
-452,6
+472,10
@@
type ContainersConfig struct {
AssignNodeHostname string
}
}
AssignNodeHostname string
}
}
+ LSF struct {
+ BsubSudoUser string
+ BsubArgumentsList []string
+ }
}
type CloudVMsConfig struct {
}
type CloudVMsConfig struct {
@@
-588,6
+612,7
@@
const (
ServiceNameRailsAPI ServiceName = "arvados-api-server"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameRailsAPI ServiceName = "arvados-api-server"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
+ ServiceNameDispatchLSF ServiceName = "arvados-dispatch-lsf"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
@@
-605,6
+630,7
@@
func (svcs Services) Map() map[ServiceName]Service {
ServiceNameRailsAPI: svcs.RailsAPI,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameRailsAPI: svcs.RailsAPI,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
+ ServiceNameDispatchLSF: svcs.DispatchLSF,
ServiceNameHealth: svcs.Health,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameHealth: svcs.Health,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,