diff --git a/operatorapi/consts.go b/operatorapi/consts.go
index 6435b8362..f668a1f9d 100644
--- a/operatorapi/consts.go
+++ b/operatorapi/consts.go
@@ -18,10 +18,9 @@ package operatorapi
// list of all console environment constants
const (
- ConsoleSubnetLicense = "CONSOLE_SUBNET_LICENSE"
- ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN"
- ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE"
- MinIOSubnetLicense = "MINIO_SUBNET_LICENSE"
+ ConsoleSubnetLicense = "CONSOLE_SUBNET_LICENSE"
+ ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN"
+ MinIOSubnetLicense = "MINIO_SUBNET_LICENSE"
// Constants for prometheus annotations
prometheusPath = "prometheus.io/path"
diff --git a/portal-ui/src/common/types.ts b/portal-ui/src/common/types.ts
index b26726aca..e4b954bda 100644
--- a/portal-ui/src/common/types.ts
+++ b/portal-ui/src/common/types.ts
@@ -25,7 +25,6 @@ export interface ITenant {
deletion_date: string;
currentState: string;
image: string;
- console_image: string;
instance_count: string;
name: string;
namespace?: string;
@@ -59,7 +58,6 @@ export interface ITenantCreator {
access_keys: string[];
secret_keys: string[];
image: string;
- console_image: string;
expose_minio: boolean;
expose_console: boolean;
pools: IPoolModel[];
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
index 38c43d427..55b59c2ac 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
@@ -317,7 +317,6 @@ const ObjectDetails = ({
let metadata = get(fileData, "user_metadata", {});
setMetadata(metadata);
- console.log("metadata:", res);
setMetadataLoad(false);
})
.catch((error: ErrorResponseHandler) => {
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
index 2be8201ab..8af509d38 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
@@ -94,7 +94,6 @@ const AddTenant = ({
const tenantName = fields.nameTenant.tenantName;
const selectedStorageClass = fields.nameTenant.selectedStorageClass;
const imageName = fields.configure.imageName;
- const consoleImage = fields.configure.consoleImage;
const customDockerhub = fields.configure.customDockerhub;
const imageRegistry = fields.configure.imageRegistry;
const imageRegistryUsername = fields.configure.imageRegistryUsername;
@@ -221,7 +220,6 @@ const AddTenant = ({
enable_prometheus: true,
service_name: "",
image: imageName,
- console_image: consoleImage,
expose_minio: exposeMinIO,
expose_console: exposeConsole,
pools: [
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx
index 56614ff78..618f7f35f 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx
@@ -40,7 +40,6 @@ interface IConfigureProps {
classes: any;
customImage: boolean;
imageName: string;
- consoleImage: string;
customDockerhub: boolean;
imageRegistry: string;
imageRegistryUsername: string;
@@ -76,7 +75,6 @@ const Configure = ({
storageClasses,
customImage,
imageName,
- consoleImage,
customDockerhub,
imageRegistry,
imageRegistryUsername,
@@ -164,14 +162,6 @@ const Configure = ({
pattern: /^((.*?)\/(.*?):(.+))$/,
customPatternMessage: "Format must be of form: 'minio/minio:VERSION'",
},
- {
- fieldKey: "consoleImage",
- required: false,
- value: consoleImage,
- pattern: /^((.*?)\/(.*?):(.+))$/,
- customPatternMessage:
- "Format must be of form: 'minio/console:VERSION'",
- },
{
fieldKey: "logSearchImage",
required: false,
@@ -234,7 +224,6 @@ const Configure = ({
}, [
customImage,
imageName,
- consoleImage,
logSearchImage,
kesImage,
logSearchPostgresImage,
@@ -606,7 +595,6 @@ const mapState = (state: AppState) => ({
storageClasses: state.tenants.createTenant.storageClasses,
customImage: state.tenants.createTenant.fields.configure.customImage,
imageName: state.tenants.createTenant.fields.configure.imageName,
- consoleImage: state.tenants.createTenant.fields.configure.consoleImage,
customDockerhub: state.tenants.createTenant.fields.configure.customDockerhub,
imageRegistry: state.tenants.createTenant.fields.configure.imageRegistry,
imageRegistryUsername:
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Preview.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Preview.tsx
index 2cfef673f..b62bf668a 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Preview.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Preview.tsx
@@ -32,7 +32,6 @@ interface IPreviewProps {
tenantName: string;
customImage: boolean;
imageName: string;
- consoleImage: string;
namespace: string;
selectedStorageClass: string;
volumeSize: string;
@@ -55,7 +54,6 @@ const Preview = ({
tenantName,
customImage,
imageName,
- consoleImage,
namespace,
selectedStorageClass,
volumeSize,
@@ -88,12 +86,6 @@ const Preview = ({
{imageName}
-
-
- Console Image
-
- {consoleImage}
-
)}
@@ -145,7 +137,6 @@ const mapState = (state: AppState) => ({
state.tenants.createTenant.fields.nameTenant.selectedStorageClass,
customImage: state.tenants.createTenant.fields.configure.customImage,
imageName: state.tenants.createTenant.fields.configure.imageName,
- consoleImage: state.tenants.createTenant.fields.configure.consoleImage,
namespace: state.tenants.createTenant.fields.nameTenant.namespace,
volumeSize: state.tenants.createTenant.fields.tenantSize.volumeSize,
sizeFactor: state.tenants.createTenant.fields.tenantSize.sizeFactor,
diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts b/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts
index 280652cec..8bc963002 100644
--- a/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts
+++ b/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts
@@ -81,7 +81,6 @@ export interface ITenant {
name: string;
namespace: string;
image: string;
- console_image: string;
pool_count: number;
currentState: string;
instance_count: 4;
diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx
index 6acb9c020..6a15cfd13 100644
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx
@@ -53,7 +53,6 @@ const UpdateTenantModal = ({
}: IUpdateTenantModal) => {
const [isSending, setIsSending] = useState(false);
const [minioImage, setMinioImage] = useState("");
- const [consoleImage, setConsoleImage] = useState("");
const [imageRegistry, setImageRegistry] = useState(false);
const [imageRegistryEndpoint, setImageRegistryEndpoint] =
useState("");
@@ -62,39 +61,30 @@ const UpdateTenantModal = ({
const [imageRegistryPassword, setImageRegistryPassword] =
useState("");
const [validMinioImage, setValidMinioImage] = useState(true);
- const [validConsoleImage, setValidConsoleImage] = useState(true);
const validateImage = useCallback(
(fieldToCheck: string) => {
const pattern = new RegExp("^$|^((.*?)/(.*?):(.+))$");
switch (fieldToCheck) {
- case "consoleImage":
- setValidConsoleImage(pattern.test(consoleImage));
- break;
case "minioImage":
setValidMinioImage(pattern.test(minioImage));
break;
}
},
- [consoleImage, minioImage]
+ [minioImage]
);
useEffect(() => {
validateImage("minioImage");
}, [minioImage, validateImage]);
- useEffect(() => {
- validateImage("consoleImage");
- }, [consoleImage, validateImage]);
-
const closeAction = () => {
closeModalAndRefresh(false);
};
const resetForm = () => {
setMinioImage("");
- setConsoleImage("");
setImageRegistry(false);
setImageRegistryEndpoint("");
setImageRegistryUsername("");
@@ -106,7 +96,6 @@ const UpdateTenantModal = ({
let payload = {
image: minioImage,
- console_image: consoleImage,
enable_prometheus: true,
};
@@ -235,7 +224,6 @@ const UpdateTenantModal = ({
color="primary"
disabled={
!validMinioImage ||
- !validConsoleImage ||
(imageRegistry &&
(imageRegistryEndpoint.trim() === "" ||
imageRegistryUsername.trim() === "" ||
diff --git a/portal-ui/src/screens/Console/Tenants/reducer.ts b/portal-ui/src/screens/Console/Tenants/reducer.ts
index 59e026305..50abd343f 100644
--- a/portal-ui/src/screens/Console/Tenants/reducer.ts
+++ b/portal-ui/src/screens/Console/Tenants/reducer.ts
@@ -63,7 +63,6 @@ const initialState: ITenantState = {
configure: {
customImage: false,
imageName: "",
- consoleImage: "",
customDockerhub: false,
imageRegistry: "",
imageRegistryUsername: "",
@@ -531,7 +530,6 @@ export function tenantsReducer(
configure: {
customImage: false,
imageName: "",
- consoleImage: "",
customDockerhub: false,
imageRegistry: "",
imageRegistryUsername: "",
diff --git a/portal-ui/src/screens/Console/Tenants/types.ts b/portal-ui/src/screens/Console/Tenants/types.ts
index d980295ae..fb388c488 100644
--- a/portal-ui/src/screens/Console/Tenants/types.ts
+++ b/portal-ui/src/screens/Console/Tenants/types.ts
@@ -124,7 +124,6 @@ export interface INameTenantFields {
export interface IConfigureFields {
customImage: boolean;
imageName: string;
- consoleImage: string;
customDockerhub: boolean;
imageRegistry: string;
imageRegistryUsername: string;