Skip to content

Commit 3d59e9a

Browse files
authored
fix npe for tls console/minio (#243)
1 parent cff712f commit 3d59e9a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

restapi/admin_tenants.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
467467
}
468468

469469
isEncryptionAvailable := false
470-
if *tenantReq.EnableTLS {
470+
if tenantReq.EnableTLS != nil && *tenantReq.EnableTLS {
471471
// If user request autoCert, Operator will generate certificate keypair for MinIO (server), Console (server) and KES (server and app mTLS)
472472
isEncryptionAvailable = true
473473
minInst.Spec.RequestAutoCert = *tenantReq.EnableTLS
@@ -536,8 +536,10 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
536536
var consoleAccess string
537537
var consoleSecret string
538538

539-
//enableConsole := true
540-
enableConsole := *tenantReq.EnableConsole
539+
enableConsole := true
540+
if tenantReq.EnableConsole != nil && *tenantReq.EnableConsole {
541+
enableConsole = *tenantReq.EnableConsole
542+
}
541543

542544
if enableConsole {
543545
consoleSelector := fmt.Sprintf("%s-console", *tenantReq.Name)
@@ -597,7 +599,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
597599
},
598600
}
599601

600-
if !minInst.Spec.RequestAutoCert && tenantReq.TLS.Console != nil {
602+
if !minInst.Spec.RequestAutoCert && tenantReq.TLS != nil && tenantReq.TLS.Console != nil {
601603
consoleExternalTLSCertificateSecretName := fmt.Sprintf("%s-console-external-certificates", secretName)
602604
tlsCrt, err := base64.StdEncoding.DecodeString(*tenantReq.TLS.Console.Crt)
603605
if err != nil {

0 commit comments

Comments
 (0)