Remove ConsoleImage references (#980)

Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>

operatorapi/consts.go

@@ -18,10 +18,9 @@ package operatorapi
 
 // list of all console environment constants
 const (
-	ConsoleSubnetLicense        = "CONSOLE_SUBNET_LICENSE"
+	ConsoleSubnetLicense   = "CONSOLE_SUBNET_LICENSE"
-	ConsoleOperatorSAToken      = "CONSOLE_OPERATOR_SA_TOKEN"
+	ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN"
-	ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE"
+	MinIOSubnetLicense     = "MINIO_SUBNET_LICENSE"
-	MinIOSubnetLicense          = "MINIO_SUBNET_LICENSE"
 
 	// Constants for prometheus annotations
 	prometheusPath   = "prometheus.io/path"

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[];

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) => {

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: [

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:

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 = ({
                 </TableCell>
                 <TableCell>{imageName}</TableCell>
               </TableRow>
-              <TableRow>
-                <TableCell align="right" className={classes.tableTitle}>
-                  Console Image
-                </TableCell>
-                <TableCell>{consoleImage}</TableCell>
-              </TableRow>
             </Fragment>
           )}
 
@@ -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,

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;

portal-ui/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx

@@ -53,7 +53,6 @@ const UpdateTenantModal = ({
 }: IUpdateTenantModal) => {
   const [isSending, setIsSending] = useState<boolean>(false);
   const [minioImage, setMinioImage] = useState<string>("");
-  const [consoleImage, setConsoleImage] = useState<string>("");
   const [imageRegistry, setImageRegistry] = useState<boolean>(false);
   const [imageRegistryEndpoint, setImageRegistryEndpoint] =
     useState<string>("");
@@ -62,39 +61,30 @@ const UpdateTenantModal = ({
   const [imageRegistryPassword, setImageRegistryPassword] =
     useState<string>("");
   const [validMinioImage, setValidMinioImage] = useState<boolean>(true);
-  const [validConsoleImage, setValidConsoleImage] = useState<boolean>(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() === "" ||

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: "",

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;