Move heal and watch to tenant details view on operator-ui

k8s/operator-console/base/kustomization.yaml

@@ -8,4 +8,4 @@ resources:
   - console-configmap.yaml
   - console-service.yaml
   - console-deployment.yaml
-  - https://github.com/minio/operator/?ref=v3.0.19
+  - https://github.com/minio/operator/?ref=v3.0.29

pkg/acl/endpoints.go

@@ -28,14 +28,12 @@ var (
 	iamPolicies         = "/policies"
 	dashboard           = "/dashboard"
 	profiling           = "/profiling"
-	watch               = "/watch"
 	notifications       = "/notification-endpoints"
 	buckets             = "/buckets"
 	bucketsDetail       = "/buckets/:bucketName"
 	serviceAccounts     = "/service-accounts"
 	tenants             = "/tenants"
 	tenantsDetail       = "/namespaces/:tenantNamespace/tenants/:tenantName"
-	heal                = "/heal"
 	remoteBuckets       = "/remote-buckets"
 	replication         = "/replication"
 	objectBrowser       = "/object-browser/:bucket/*"
@@ -122,16 +120,6 @@ var usersActionSet = ConfigurationActionSet{
 	),
 }
 
-// watchActionSet contains the list of admin actions required for this endpoint to work
-var watchActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.ListenBucketNotificationAction,
-	),
-}
-
 // notificationsActionSet contains the list of admin actions required for this endpoint to work
 var notificationsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
@@ -182,16 +170,6 @@ var tenantsActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
-// healActionSet contains the list of admin actions required for this endpoint to work
-var healActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.HealAdminAction,
-	),
-}
-
 var remoteBucketsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
 		iampolicy.AllAdminActions,
@@ -230,12 +208,10 @@ var endpointRules = map[string]ConfigurationActionSet{
 	iamPolicies:         iamPoliciesActionSet,
 	dashboard:           dashboardActionSet,
 	profiling:           profilingActionSet,
-	watch:               watchActionSet,
 	notifications:       notificationsActionSet,
 	buckets:             bucketsActionSet,
 	bucketsDetail:       bucketsActionSet,
 	serviceAccounts:     serviceAccountsActionSet,
-	heal:                healActionSet,
 	remoteBuckets:       remoteBucketsActionSet,
 	replication:         replicationActionSet,
 	objectBrowser:       objectBrowserActionSet,

pkg/acl/endpoints_test.go

@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 15,
+			want: 13,
 		},
 		{
 			name: "all s3 endpoints",
@@ -91,7 +91,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 18,
+			want: 16,
 		},
 		{
 			name: "no endpoints",

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

@@ -42,8 +42,6 @@ import ListNotificationEndpoints from "./NotificationEndopoints/ListNotification
 import ConfigurationsList from "./Configurations/ConfigurationPanels/ConfigurationsList";
 import { Button, LinearProgress } from "@material-ui/core";
 import WebhookPanel from "./Configurations/ConfigurationPanels/WebhookPanel";
-import Heal from "./Heal/Heal";
-import Watch from "./Watch/Watch";
 import ListTenants from "./Tenants/ListTenants/ListTenants";
 import { ISessionResponse } from "./types";
 import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
@@ -221,10 +219,6 @@ const Console = ({
       component: ObjectRouting,
       path: "/object-browser/:bucket/*",
     },
-    {
-      component: Watch,
-      path: "/watch",
-    },
     {
       component: Users,
       path: "/users",
@@ -237,10 +231,6 @@ const Console = ({
       component: Policies,
       path: "/policies",
     },
-    {
-      component: Heal,
-      path: "/heal",
-    },
     {
       component: ListNotificationEndpoints,
       path: "/notification-endpoints",

portal-ui/src/screens/Console/Menu/Menu.tsx

@@ -240,22 +240,6 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       name: "IAM Policies",
       icon: <IAMPoliciesIcon />,
     },
-    {
-      group: "Tools",
-      type: "item",
-      component: NavLink,
-      to: "/watch",
-      name: "Watch",
-      icon: <WatchIcon />,
-    },
-    {
-      group: "Tools",
-      type: "item",
-      component: NavLink,
-      to: "/heal",
-      name: "Heal",
-      icon: <HealIcon />,
-    },
     {
       group: "Admin",
       type: "item",

portal-ui/src/screens/Console/Menu/utils.ts

@@ -18,7 +18,6 @@ export const menuGroups = [
   { label: "", group: "common", collapsible: false },
   { label: "User", group: "User", collapsible: true },
   { label: "Admin", group: "Admin", collapsible: true },
-  { label: "Tools", group: "Tools", collapsible: true },
   { label: "Operator", group: "Operator", collapsible: true },
   { label: "", group: "License", collapsible: false },
 ];