Skip to content

Commit 6ac95e4

Browse files
authored
Get Tenants endpoints check hostname (#609)
1 parent 70fb729 commit 6ac95e4

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

restapi/admin_tenants.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,10 +404,22 @@ func getTenantInfoResponse(session *models.Principal, params admin_api.TenantInf
404404
var minioEndpoint string
405405
var consoleEndpoint string
406406
if minSvc != nil && len(minSvc.Status.LoadBalancer.Ingress) > 0 {
407-
minioEndpoint = fmt.Sprintf("%s://%s", schema, minSvc.Status.LoadBalancer.Ingress[0].IP)
407+
if minSvc.Status.LoadBalancer.Ingress[0].IP != "" {
408+
minioEndpoint = fmt.Sprintf("%s://%s", schema, minSvc.Status.LoadBalancer.Ingress[0].IP)
409+
}
410+
411+
if minSvc.Status.LoadBalancer.Ingress[0].Hostname != "" {
412+
minioEndpoint = fmt.Sprintf("%s://%s", schema, minSvc.Status.LoadBalancer.Ingress[0].Hostname)
413+
}
414+
408415
}
409416
if conSvc != nil && len(conSvc.Status.LoadBalancer.Ingress) > 0 {
410-
consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort)
417+
if conSvc.Status.LoadBalancer.Ingress[0].IP != "" {
418+
consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort)
419+
}
420+
if conSvc.Status.LoadBalancer.Ingress[0].Hostname != "" {
421+
consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].Hostname, consolePort)
422+
}
411423
}
412424
if minioEndpoint != "" || consoleEndpoint != "" {
413425
info.Endpoints = &models.TenantEndpoints{

0 commit comments

Comments
 (0)