From 3d59e9ac30ba7f1d13b697d81f49c3e27117e28b Mon Sep 17 00:00:00 2001 From: Lenin Alevski Date: Sun, 9 Aug 2020 17:19:39 -0700 Subject: [PATCH] fix npe for tls console/minio (#243) --- restapi/admin_tenants.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/restapi/admin_tenants.go b/restapi/admin_tenants.go index 90e856095..55c4e39b7 100644 --- a/restapi/admin_tenants.go +++ b/restapi/admin_tenants.go @@ -467,7 +467,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create } isEncryptionAvailable := false - if *tenantReq.EnableTLS { + if tenantReq.EnableTLS != nil && *tenantReq.EnableTLS { // If user request autoCert, Operator will generate certificate keypair for MinIO (server), Console (server) and KES (server and app mTLS) isEncryptionAvailable = true minInst.Spec.RequestAutoCert = *tenantReq.EnableTLS @@ -536,8 +536,10 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create var consoleAccess string var consoleSecret string - //enableConsole := true - enableConsole := *tenantReq.EnableConsole + enableConsole := true + if tenantReq.EnableConsole != nil && *tenantReq.EnableConsole { + enableConsole = *tenantReq.EnableConsole + } if enableConsole { consoleSelector := fmt.Sprintf("%s-console", *tenantReq.Name) @@ -597,7 +599,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create }, } - if !minInst.Spec.RequestAutoCert && tenantReq.TLS.Console != nil { + if !minInst.Spec.RequestAutoCert && tenantReq.TLS != nil && tenantReq.TLS.Console != nil { consoleExternalTLSCertificateSecretName := fmt.Sprintf("%s-console-external-certificates", secretName) tlsCrt, err := base64.StdEncoding.DecodeString(*tenantReq.TLS.Console.Crt) if err != nil {