Skip to content

Commit 396d8fb

Browse files
authored
GCP KMS many fixes (#600)
- Operator-UI didnt correctly append gcp kms configuration
1 parent f958b73 commit 396d8fb

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import React, { useCallback, useEffect, useMemo, useState } from "react";
1818
import debounce from "lodash/debounce";
1919
import get from "lodash/get";
20-
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
2120
import Grid from "@material-ui/core/Grid";
2221
import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
2322
import { Button, LinearProgress, Paper, Typography } from "@material-ui/core";
@@ -27,10 +26,7 @@ import TableCell from "@material-ui/core/TableCell";
2726
import TableRow from "@material-ui/core/TableRow";
2827
import api from "../../../../common/api";
2928
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
30-
import {
31-
containerForHeader,
32-
modalBasic,
33-
} from "../../Common/FormComponents/common/styleLibrary";
29+
import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
3430
import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
3531
import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
3632
import {
@@ -268,6 +264,7 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
268264
vaultCert: "",
269265
vaultCA: "",
270266
gemaltoCA: "",
267+
gcpPrivateKey: "",
271268
});
272269

273270
// Files States
@@ -853,17 +850,6 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
853850
];
854851
}
855852

856-
if (encryptionType === "gcp") {
857-
encryptionValidation = [
858-
...encryptionValidation,
859-
{
860-
fieldKey: "gcp_project_id",
861-
required: true,
862-
value: gcpProjectID,
863-
},
864-
];
865-
}
866-
867853
if (encryptionType === "aws") {
868854
encryptionValidation = [
869855
...encryptionValidation,
@@ -1100,7 +1086,7 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
11001086
},
11011087
};
11021088
break;
1103-
case "GCP":
1089+
case "gcp":
11041090
insertEncrypt = {
11051091
gcp: {
11061092
secretmanager: {
@@ -2311,12 +2297,9 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
23112297
name="gcp_project_id"
23122298
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
23132299
setGcpProjectID(e.target.value);
2314-
clearValidationError("gcp_project_id");
23152300
}}
23162301
label="Project ID"
23172302
value={gcpProjectID}
2318-
error={validationErrors["gcp_project_id"] || ""}
2319-
required
23202303
/>
23212304
</Grid>
23222305
<Grid item xs={12}>

restapi/consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const (
6262

6363
// Image versions
6464
const (
65-
KESImageVersion = "minio/kes:v0.13.1"
65+
KESImageVersion = "minio/kes:v0.13.4"
6666
ConsoleImageDefaultVersion = "minio/console:v0.5.2"
6767
)
6868

0 commit comments

Comments
 (0)