projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16580: remove more references to Nodemanager.
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 9f9f00e6445ec676b7ca19877cef1e7b304912e2..c21addbba99284e5ad3e634e24e75e5deac9558e 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-126,6
+126,7
@@
type Cluster struct {
BalancePeriod Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalancePeriod Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
+ BalanceTimeout Duration
WebDAVCache WebDAVCacheConfig
}
WebDAVCache WebDAVCacheConfig
}
@@
-156,6
+157,15
@@
type Cluster struct {
ClientSecret string
AlternateEmailAddresses bool
}
ClientSecret string
AlternateEmailAddresses bool
}
+ OpenIDConnect struct {
+ Enable bool
+ Issuer string
+ ClientID string
+ ClientSecret string
+ EmailClaim string
+ EmailVerifiedClaim string
+ UsernameClaim string
+ }
PAM struct {
Enable bool
Service string
PAM struct {
Enable bool
Service string
@@
-259,12
+269,15
@@
type Volume struct {
}
type S3VolumeDriverParameters struct {
}
type S3VolumeDriverParameters struct {
+ IAMRole string
AccessKey string
SecretKey string
Endpoint string
Region string
Bucket string
LocationConstraint bool
AccessKey string
SecretKey string
Endpoint string
Region string
Bucket string
LocationConstraint bool
+ V2Signature bool
+ UseAWSS3v2Driver bool
IndexPageSize int
ConnectTimeout Duration
ReadTimeout Duration
IndexPageSize int
ConnectTimeout Duration
ReadTimeout Duration
@@
-301,7
+314,6
@@
type Services struct {
Keepbalance Service
Keepproxy Service
Keepstore Service
Keepbalance Service
Keepproxy Service
Keepstore Service
- Nodemanager Service
RailsAPI Service
SSO Service
WebDAVDownload Service
RailsAPI Service
SSO Service
WebDAVDownload Service
@@
-540,7
+552,7
@@
func (ss *StringSet) UnmarshalJSON(data []byte) error {
return err
}
*ss = make(map[string]struct{}, len(hash))
return err
}
*ss = make(map[string]struct{}, len(hash))
- for t
, _
:= range hash {
+ for t := range hash {
(*ss)[t] = struct{}{}
}
(*ss)[t] = struct{}{}
}
@@
-554,7
+566,6
@@
const (
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameHealth ServiceName = "arvados-health"
- ServiceNameNodemanager ServiceName = "arvados-node-manager"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameWebsocket ServiceName = "arvados-ws"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameWebsocket ServiceName = "arvados-ws"
@@
-572,7
+583,6
@@
func (svcs Services) Map() map[ServiceName]Service {
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameHealth: svcs.Health,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameHealth: svcs.Health,
- ServiceNameNodemanager: svcs.Nodemanager,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameWebsocket: svcs.Websocket,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameWebsocket: svcs.Websocket,