mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes an issue with empty logsearch & prometheus configurations (#703)

Browse Source
This commit is contained in:
Alex
2021-04-22 22:54:17 -05:00
committed by GitHub
parent ca742b781f
commit 2981e63797
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
restapi/admin_tenants.go
View File

@@ -940,13 +940,20 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
}
//Default class name for Log search
diskSpaceFromAPI := int64(*tenantReq.LogSearchConfiguration.StorageSize) // Default is 5 by API
logSearchDiskSpace := resource.NewQuantity(diskSpaceFromAPI, resource.DecimalExponent)
logSearchStorageClass := tenantReq.LogSearchConfiguration.StorageClass // Default is ""
diskSpaceFromAPI := int64(5) // Default is 5
logSearchStorageClass := "" // Default is ""
if tenantReq.LogSearchConfiguration.StorageClass == "" && len(tenantReq.Pools) > 0 {
logSearchStorageClass = tenantReq.Pools[0].VolumeConfiguration.StorageClassName
if tenantReq.LogSearchConfiguration != nil {
diskSpaceFromAPI = int64(*tenantReq.LogSearchConfiguration.StorageSize)
logSearchStorageClass = tenantReq.LogSearchConfiguration.StorageClass
if tenantReq.LogSearchConfiguration.StorageClass == "" && len(tenantReq.Pools) > 0 {
logSearchStorageClass = tenantReq.Pools[0].VolumeConfiguration.StorageClassName
}
}
logSearchDiskSpace := resource.NewQuantity(diskSpaceFromAPI, resource.DecimalExponent)
// default activate lgo search and prometheus
minInst.Spec.Log = &miniov2.LogConfig{
Image: "minio/logsearchapi:v4.0.0",
@@ -971,12 +978,17 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
},
}
prometheusDiskSpace := int(*tenantReq.PrometheusConfiguration.StorageSize) // Default is 5 by API
prometheusStorageClass := tenantReq.PrometheusConfiguration.StorageClass // Default is ""
prometheusDiskSpace := int(5) // Default is 5 by API
prometheusStorageClass := "" // Default is ""
// Default class name for prometheus
if tenantReq.PrometheusConfiguration.StorageClass == "" && len(tenantReq.Pools) > 0 {
prometheusStorageClass = tenantReq.Pools[0].VolumeConfiguration.StorageClassName
if tenantReq.PrometheusConfiguration != nil {
prometheusDiskSpace = int(*tenantReq.PrometheusConfiguration.StorageSize)
prometheusStorageClass = tenantReq.PrometheusConfiguration.StorageClass
// Default class name for prometheus
if tenantReq.PrometheusConfiguration.StorageClass == "" && len(tenantReq.Pools) > 0 {
prometheusStorageClass = tenantReq.Pools[0].VolumeConfiguration.StorageClassName
}
}
minInst.Spec.Prometheus = &miniov2.PrometheusConfig{