Skip to content

Commit 288bf01

Browse files
authored
Permanently enable ILM (#740)
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent d546f05 commit 288bf01

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

portal-ui/src/screens/Console/Buckets/ViewBucket/ViewBucket.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ const ViewBucket = ({
280280
const [addLifecycleOpen, setAddLifecycleOpen] = useState<boolean>(false);
281281

282282
const bucketName = match.params["bucketName"];
283-
const ilmEnabled = session.features?.indexOf("ilm") > -1;
284283
const usersEnabled = session.pages?.indexOf("/users") > -1;
285284

286285
// check the permissions for creating bucket
@@ -956,7 +955,7 @@ const ViewBucket = ({
956955
)}
957956
<Tab label="Policies" {...a11yProps(2)} />
958957
{usersEnabled && <Tab label="Users" {...a11yProps(3)} />}
959-
{ilmEnabled && <Tab label="Lifecycle" {...a11yProps(4)} />}
958+
<Tab label="Lifecycle" {...a11yProps(4)} />
960959
</Tabs>
961960
</Grid>
962961
<Grid item xs={3} className={classes.actionsTray}>

portal-ui/src/screens/Console/Configurations/ConfigurationMain.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ const styles = (theme: Theme) =>
4646

4747
const ConfigurationMain = ({ classes, session }: IConfigurationMain) => {
4848
const [selectedTab, setSelectedTab] = useState<number>(0);
49-
const ilmEnabled = session.features?.indexOf("ilm") > -1;
5049

5150
return (
5251
<Fragment>
@@ -69,7 +68,7 @@ const ConfigurationMain = ({ classes, session }: IConfigurationMain) => {
6968
>
7069
<Tab label="Configurations" />
7170
<Tab label="Lambda Notifications" />
72-
{ilmEnabled && <Tab label="Tiers" />}
71+
<Tab label="Tiers" />
7372
</Tabs>
7473
<Grid item xs={12}>
7574
{selectedTab === 0 && (

restapi/user_session.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/minio/console/pkg/acl"
2323
"github.com/minio/console/restapi/operations"
2424
"github.com/minio/console/restapi/operations/user_api"
25-
"github.com/minio/minio/pkg/env"
2625
)
2726

2827
func registerSessionHandlers(api *operations.ConsoleAPI) {
@@ -54,9 +53,5 @@ func getSessionResponse(session *models.Principal) (*models.SessionResponse, *mo
5453
// getListOfEnabledFeatures returns a list of features
5554
func getListOfEnabledFeatures() []string {
5655
var features []string
57-
ilm := env.IsSet("_CONSOLE_ILM_SUPPORT")
58-
if ilm {
59-
features = append(features, "ilm")
60-
}
6156
return features
6257
}

0 commit comments

Comments
 (0)