From cd547e94250e19a0984fc87c838dc124e2cf9fe5 Mon Sep 17 00:00:00 2001 From: Daniel Valdivia Date: Sun, 2 Aug 2020 23:04:51 -0700 Subject: [PATCH] Limit Console RAM to 64Mi. Increase Logging for Tenant APIs. (#225) --- restapi/admin_tenants.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/restapi/admin_tenants.go b/restapi/admin_tenants.go index 3f0531064..ea65a7295 100644 --- a/restapi/admin_tenants.go +++ b/restapi/admin_tenants.go @@ -57,6 +57,7 @@ func registerTenantHandlers(api *operations.ConsoleAPI) { api.AdminAPICreateTenantHandler = admin_api.CreateTenantHandlerFunc(func(params admin_api.CreateTenantParams, session *models.Principal) middleware.Responder { resp, err := getTenantCreatedResponse(session, params) if err != nil { + log.Println(err) return admin_api.NewCreateTenantDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } return admin_api.NewCreateTenantOK().WithPayload(resp) @@ -65,6 +66,7 @@ func registerTenantHandlers(api *operations.ConsoleAPI) { api.AdminAPIListAllTenantsHandler = admin_api.ListAllTenantsHandlerFunc(func(params admin_api.ListAllTenantsParams, session *models.Principal) middleware.Responder { resp, err := getListAllTenantsResponse(session, params) if err != nil { + log.Println(err) return admin_api.NewListTenantsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } return admin_api.NewListTenantsOK().WithPayload(resp) @@ -74,6 +76,7 @@ func registerTenantHandlers(api *operations.ConsoleAPI) { api.AdminAPIListTenantsHandler = admin_api.ListTenantsHandlerFunc(func(params admin_api.ListTenantsParams, session *models.Principal) middleware.Responder { resp, err := getListTenantsResponse(session, params) if err != nil { + log.Println(err) return admin_api.NewListTenantsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } return admin_api.NewListTenantsOK().WithPayload(resp) @@ -83,6 +86,7 @@ func registerTenantHandlers(api *operations.ConsoleAPI) { api.AdminAPITenantInfoHandler = admin_api.TenantInfoHandlerFunc(func(params admin_api.TenantInfoParams, session *models.Principal) middleware.Responder { resp, err := getTenantInfoResponse(session, params) if err != nil { + log.Println(err) return admin_api.NewTenantInfoDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } return admin_api.NewTenantInfoOK().WithPayload(resp) @@ -695,6 +699,11 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create Replicas: 2, Image: consoleVersion, ConsoleSecret: &corev1.LocalObjectReference{Name: consoleSecretName}, + Resources: corev1.ResourceRequirements{ + Requests: map[corev1.ResourceName]resource.Quantity{ + "memory": resource.MustParse("64Mi"), + }, + }, } }