Skip to content

Commit adf3f92

Browse files
authored
Add Tenant Deletion Date to tenant responses (#270)
1 parent 3b23e87 commit adf3f92

File tree

6 files changed

+33
-113
lines changed

6 files changed

+33
-113
lines changed

models/tenant.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/tenant_list.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/update_certificates_request.go

Lines changed: 0 additions & 113 deletions
This file was deleted.

restapi/admin_tenants.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,14 @@ func getTenantInfo(tenant *operator.Tenant) *models.Tenant {
266266
zoneSize := int64(z.Servers) * int64(z.VolumesPerServer) * z.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value()
267267
totalSize = totalSize + zoneSize
268268
}
269+
var deletion string
270+
if tenant.ObjectMeta.DeletionTimestamp != nil {
271+
deletion = tenant.ObjectMeta.DeletionTimestamp.String()
272+
}
269273

270274
return &models.Tenant{
271275
CreationDate: tenant.ObjectMeta.CreationTimestamp.String(),
276+
DeletionDate: deletion,
272277
Name: tenant.Name,
273278
TotalSize: totalSize,
274279
CurrentState: tenant.Status.CurrentState,
@@ -330,8 +335,14 @@ func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace
330335
}
331336
}
332337

338+
var deletion string
339+
if tenant.ObjectMeta.DeletionTimestamp != nil {
340+
deletion = tenant.ObjectMeta.DeletionTimestamp.String()
341+
}
342+
333343
tenants = append(tenants, &models.TenantList{
334344
CreationDate: tenant.ObjectMeta.CreationTimestamp.String(),
345+
DeletionDate: deletion,
335346
Name: tenant.ObjectMeta.Name,
336347
ZoneCount: int64(len(tenant.Spec.Zones)),
337348
InstanceCount: instanceCount,

restapi/embedded_spec.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swagger.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,6 +1828,8 @@ definitions:
18281828
type: string
18291829
creation_date:
18301830
type: string
1831+
deletion_date:
1832+
type: string
18311833
currentState:
18321834
type: string
18331835
zones:
@@ -1867,6 +1869,8 @@ definitions:
18671869
type: integer
18681870
creation_date:
18691871
type: string
1872+
deletion_date:
1873+
type: string
18701874
currentState:
18711875
type: string
18721876
namespace:

0 commit comments

Comments
 (0)