mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update minio-operator version (#199)

Browse Source
This commit is contained in:
Cesar N
2020-07-23 11:13:05 -07:00
committed by GitHub
parent e6a3bd5af5
commit 4a5be810ce
12 changed files with 205 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
restapi/admin_tenants.go
View File

@@ -134,9 +134,9 @@ func getDeleteTenantResponse(session *models.Principal, params admin_api.DeleteT
return deleteTenantAction(context.Background(), opClient, params.Namespace, params.Tenant)
}
func identifyMinioInstanceScheme(mi *operator.MinIOInstance) string {
func getMinioInstanceScheme(mi *operator.MinIOInstance) string {
scheme := "http"
if mi.RequiresAutoCertSetup() || mi.RequiresExternalCertSetup() {
if mi.AutoCert() || mi.ExternalCert() {
scheme = "https"
}
return scheme
@@ -239,7 +239,7 @@ func getTenantInfoResponse(session *models.Principal, params admin_api.TenantInf
log.Println("error getting minioInstance:", err)
return nil, err
}
minioInstanceScheme := identifyMinioInstanceScheme(minInst)
minioInstanceScheme := getMinioInstanceScheme(minInst)
mAdmin, err := getTenantAdminClient(ctx, k8sClient, params.Namespace, params.Tenant, minInst.Spec.ServiceName, minioInstanceScheme)
if err != nil {
log.Println("error getting tenant's admin client:", err)