From 68e0f1d6a2feafec9f05cb8cf2a32d6d65128708 Mon Sep 17 00:00:00 2001 From: Daniel Valdivia Date: Wed, 13 Jan 2021 13:24:30 -0800 Subject: [PATCH] Determine schema for console endpoint (#550) * Determine schema for console endpoint * Simplify check * Differenciate Schema --- restapi/admin_tenants.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/restapi/admin_tenants.go b/restapi/admin_tenants.go index ad5bddf2c..f4f3e5655 100644 --- a/restapi/admin_tenants.go +++ b/restapi/admin_tenants.go @@ -390,9 +390,13 @@ func getTenantInfoResponse(session *models.Principal, params admin_api.TenantInf } schema := "http" + consoleSchema := "http" consolePort := ":9090" if minTenant.TLS() { schema = "https" + } + if minTenant.AutoCert() || minTenant.ConsoleExternalCert() { + consoleSchema = "https" consolePort = ":9443" } var minioEndpoint string @@ -401,7 +405,7 @@ func getTenantInfoResponse(session *models.Principal, params admin_api.TenantInf minioEndpoint = fmt.Sprintf("%s://%s", schema, minSvc.Status.LoadBalancer.Ingress[0].IP) } if len(conSvc.Status.LoadBalancer.Ingress) > 0 { - consoleEndpoint = fmt.Sprintf("%s://%s%s", schema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort) + consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort) } if minioEndpoint != "" || consoleEndpoint != "" { info.Endpoints = &models.TenantEndpoints{