@@ -422,7 +422,7 @@ func getListTenantsResponse(session *models.Principal, params admin_api.ListTena
422422 return listT , nil
423423}
424424
425- func getTenantCreatedResponse (session * models.Principal , params admin_api.CreateTenantParams ) (* models.CreateTenantResponse , * models.Error ) {
425+ func getTenantCreatedResponse (session * models.Principal , params admin_api.CreateTenantParams ) (response * models.CreateTenantResponse , mError * models.Error ) {
426426 tenantReq := params .Body
427427 minioImage := tenantReq .Image
428428 ctx := context .Background ()
@@ -478,11 +478,24 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
478478 if err != nil {
479479 return nil , prepareError (err )
480480 }
481+ // delete secrets created if an error occurred during tenant creation,
482+ defer func () {
483+ if mError != nil {
484+ log .Printf ("deleting secrets created for failed tenant: %s if any\n " , tenantName )
485+ opts := metav1.ListOptions {
486+ LabelSelector : fmt .Sprintf ("%s=%s" , operator .TenantLabel , tenantName ),
487+ }
488+ err = clientSet .CoreV1 ().Secrets (ns ).DeleteCollection (ctx , metav1.DeleteOptions {}, opts )
489+ if err != nil {
490+ log .Println ("error deleting tenant's secrets:" , err )
491+ }
492+ }
493+ }()
481494
482495 var envrionmentVariables []corev1.EnvVar
483496 // Check the Erasure Coding Parity for validity and pass it to Tenant
484497 if tenantReq .ErasureCodingParity > 0 {
485- if tenantReq .ErasureCodingParity < 2 && tenantReq .ErasureCodingParity > 8 {
498+ if tenantReq .ErasureCodingParity < 2 || tenantReq .ErasureCodingParity > 8 {
486499 return nil , prepareError (errorInvalidErasureCodingValue )
487500 }
488501 envrionmentVariables = append (envrionmentVariables , corev1.EnvVar {
@@ -713,7 +726,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
713726
714727 if tenantReq .ImagePullSecret != "" {
715728 imagePullSecret = tenantReq .ImagePullSecret
716- } else if imagePullSecret , err = setImageRegistry (ctx , tenantName , tenantReq .ImageRegistry , clientSet .CoreV1 (), ns ); err != nil {
729+ } else if imagePullSecret , err = setImageRegistry (ctx , tenantReq .ImageRegistry , clientSet .CoreV1 (), ns , tenantName ); err != nil {
717730 return nil , prepareError (err )
718731 }
719732 // pass the image pull secret to the Tenant
@@ -752,7 +765,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
752765 return nil , prepareError (err )
753766 }
754767 }
755- response : =& models.CreateTenantResponse {
768+ response = & models.CreateTenantResponse {
756769 AccessKey : accessKey ,
757770 SecretKey : secretKey ,
758771 }
@@ -768,7 +781,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
768781
769782// setImageRegistry creates a secret to store the private registry credentials, if one exist it updates the existing one
770783// returns the name of the secret created/updated
771- func setImageRegistry (ctx context.Context , tenantName string , req * models.ImageRegistry , clientset v1.CoreV1Interface , namespace string ) (string , error ) {
784+ func setImageRegistry (ctx context.Context , req * models.ImageRegistry , clientset v1.CoreV1Interface , namespace , tenantName string ) (string , error ) {
772785 if req == nil || req .Registry == nil || req .Username == nil || req .Password == nil {
773786 return "" , nil
774787 }
@@ -839,7 +852,7 @@ func updateTenantAction(ctx context.Context, operatorClient OperatorClientI, cli
839852 minInst .Spec .ImagePullSecret .Name = params .Body .ImagePullSecret
840853 } else {
841854 // update the image pull secret content
842- if _ , err := setImageRegistry (ctx , params . Tenant , imageRegistryReq , clientset , namespace ); err != nil {
855+ if _ , err := setImageRegistry (ctx , imageRegistryReq , clientset , namespace , params . Tenant ); err != nil {
843856 log .Println ("error setting image registry secret:" , err )
844857 return err
845858 }
0 commit comments