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

Operator improvements (#1798)

Browse Source 
Added new design to Tenants page list
Added Pool details initial page

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
This commit is contained in:
Alex
2022-04-05 10:27:54 -06:00
committed by GitHub
parent 822724a4f1
commit 64ffa039b4
21 changed files with 2002 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
operatorapi/embedded_spec.go
View File

@@ -3454,6 +3454,12 @@ func init() {
"pool_count": {
"type": "integer"
},
"tiers": {
"type": "array",
"items": {
"$ref": "#/definitions/tenantTierElement"
}
},
"total_size": {
"type": "integer"
},
@@ -3696,6 +3702,21 @@ func init() {
}
}
},
"tenantTierElement": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"size": {
"type": "integer",
"format": "int64"
},
"type": {
"type": "string"
}
}
},
"tenantUsage": {
"type": "object",
"properties": {
@@ -8044,6 +8065,12 @@ func init() {
"pool_count": {
"type": "integer"
},
"tiers": {
"type": "array",
"items": {
"$ref": "#/definitions/tenantTierElement"
}
},
"total_size": {
"type": "integer"
},
@@ -8286,6 +8313,21 @@ func init() {
}
}
},
"tenantTierElement": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"size": {
"type": "integer",
"format": "int64"
},
"type": {
"type": "string"
}
}
},
"tenantUsage": {
"type": "object",
"properties": {

13
operatorapi/tenants.go
View File

@@ -808,6 +808,18 @@ func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace
deletion = tenant.ObjectMeta.DeletionTimestamp.Format(time.RFC3339)
}
var tiers []*models.TenantTierElement
for _, tier := range tenant.Status.Usage.Tiers {
tierItem := &models.TenantTierElement{
Name: tier.Name,
Type: tier.Type,
Size: tier.TotalSize,
}
tiers = append(tiers, tierItem)
}
tenants = append(tenants, &models.TenantList{
CreationDate: tenant.ObjectMeta.CreationTimestamp.Format(time.RFC3339),
DeletionDate: deletion,
@@ -823,6 +835,7 @@ func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace
CapacityRawUsage: tenant.Status.Usage.RawUsage,
Capacity: tenant.Status.Usage.Capacity,
CapacityUsage: tenant.Status.Usage.Usage,
Tiers: tiers,
})
}