Merge branch 'master' into max-mem-api

dvaldivia · web-flow · commit 1783b395b2a0 · 2020-09-02T13:51:42.000-07:00
diff --git a/k8s/console/base/console-deployment.yaml b/k8s/console/base/console-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.3.17
+          image: minio/console:v0.3.18
           imagePullPolicy: "IfNotPresent"
           args:
             - server
diff --git a/k8s/operator-console/base/console-deployment.yaml b/k8s/operator-console/base/console-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.3.17
+          image: minio/console:v0.3.18
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CONSOLE_OPERATOR_MODE
diff --git a/restapi/admin_tenants.go b/restapi/admin_tenants.go
@@ -635,7 +635,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
 			return nil, err
 		}
 
-		const consoleVersion = "minio/console:v0.3.17"
+		const consoleVersion = "minio/console:v0.3.18"
 		minInst.Spec.Console = &operator.ConsoleConfiguration{
 			Replicas:      1,
 			Image:         consoleVersion,
diff --git a/restapi/admin_tenants_test.go b/restapi/admin_tenants_test.go
@@ -871,7 +871,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				},
 				params: admin_api.UpdateTenantParams{
 					Body: &models.UpdateTenantRequest{
-						ConsoleImage: "minio/console:v0.3.17",
+						ConsoleImage: "minio/console:v0.3.18",
 					},
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create`
`635`	`635`	`return nil, err`
`636`	`636`	`}`
`637`	`637`
`638`		`- const consoleVersion = "minio/console:v0.3.17"`
	`638`	`+ const consoleVersion = "minio/console:v0.3.18"`
`639`	`639`	`minInst.Spec.Console = &operator.ConsoleConfiguration{`
`640`	`640`	`Replicas: 1,`
`641`	`641`	`Image: consoleVersion,`