Skip to content

Commit 14ba452

Browse files
dvaldiviaAdam Stafford
authored andcommitted
Pod Events
1 parent 480e6d7 commit 14ba452

24 files changed

+1039
-101
lines changed

models/event_list.go

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/event_list_wrapper.go

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/acl/endpoints.go

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ var (
4444
tenants = "/tenants"
4545
tenantsDetail = "/namespaces/:tenantNamespace/tenants/:tenantName"
4646
podsDetail = "/namespaces/:tenantNamespace/tenants/:tenantName/pods/:podName"
47-
tenantsDetailSummary = "/namespaces/:tenantNamespace/tenants/:tenantName/summary"
48-
tenantsDetailPods = "/namespaces/:tenantNamespace/tenants/:tenantName/pods"
49-
tenantsDetailPools = "/namespaces/:tenantNamespace/tenants/:tenantName/pools"
50-
tenantsDetailLicense = "/namespaces/:tenantNamespace/tenants/:tenantName/license"
5147
storage = "/storage"
5248
storageVolumes = "/storage/volumes"
5349
storageDrives = "/storage/drives"
@@ -322,17 +318,13 @@ var endpointRules = map[string]ConfigurationActionSet{
322318

323319
// operatorRules contains the mapping between endpoints and ActionSets for operator only mode
324320
var operatorRules = map[string]ConfigurationActionSet{
325-
tenants: tenantsActionSet,
326-
tenantsDetail: tenantsActionSet,
327-
tenantsDetailSummary: tenantsActionSet,
328-
tenantsDetailPods: tenantsActionSet,
329-
tenantsDetailPools: tenantsActionSet,
330-
tenantsDetailLicense: tenantsActionSet,
331-
podsDetail: tenantsActionSet,
332-
storage: storageActionSet,
333-
storageDrives: storageActionSet,
334-
storageVolumes: storageActionSet,
335-
license: licenseActionSet,
321+
tenants: tenantsActionSet,
322+
tenantsDetail: tenantsActionSet,
323+
podsDetail: tenantsActionSet,
324+
storage: storageActionSet,
325+
storageDrives: storageActionSet,
326+
storageVolumes: storageActionSet,
327+
license: licenseActionSet,
336328
}
337329

338330
// operatorOnly ENV variable

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketEventsPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const BucketEventsPanel = ({
105105
const tableActions = [{ type: "delete", onClick: confirmDeleteEvent }];
106106

107107
const filteredRecords = records.filter((item: BucketEvent) => {
108-
if(item.arn.toLowerCase().includes(filter.toLowerCase())) {
108+
if (item.arn.toLowerCase().includes(filter.toLowerCase())) {
109109
return true;
110110
}
111111
return false;

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketLifecyclePanel.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,12 @@ const BucketLifecyclePanel = ({
154154
},
155155
];
156156

157-
const filteredRecords = lifecycleRecords.filter(
158-
(item: LifeCycleItem) => {
159-
if (item.id.toLocaleLowerCase().includes(filter.toLowerCase()))
160-
{
161-
return true;
162-
}
163-
return false;
157+
const filteredRecords = lifecycleRecords.filter((item: LifeCycleItem) => {
158+
if (item.id.toLocaleLowerCase().includes(filter.toLowerCase())) {
159+
return true;
164160
}
165-
);
161+
return false;
162+
});
166163

167164
return (
168165
<Fragment>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -358,22 +358,6 @@ const Console = ({
358358
component: PodDetails,
359359
path: "/namespaces/:tenantNamespace/tenants/:tenantName/pods/:podName",
360360
},
361-
{
362-
component: TenantDetails,
363-
path: "/namespaces/:tenantNamespace/tenants/:tenantName/summary",
364-
},
365-
{
366-
component: TenantDetails,
367-
path: "/namespaces/:tenantNamespace/tenants/:tenantName/pods",
368-
},
369-
{
370-
component: TenantDetails,
371-
path: "/namespaces/:tenantNamespace/tenants/:tenantName/pools",
372-
},
373-
{
374-
component: TenantDetails,
375-
path: "/namespaces/:tenantNamespace/tenants/:tenantName/license",
376-
},
377361
{
378362
component: License,
379363
path: "/license",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ const DirectCSIMain = ({
303303
<br />
304304
</Grid>
305305
<Grid item xs={12}>
306-
{(notAvailable && !loading) ? (
306+
{notAvailable && !loading ? (
307307
<div className={classes.notAvailableNotice}>
308308
To manage locally attached drives you need to install direct-csi,
309309
for more information

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,11 @@ const LicenseModal = ({ classes, open, closeModal }: ILicenseModalProps) => {
904904
school, if any, to sign a &quot;copyright disclaimer&quot; for the
905905
program, if necessary. For more information on this, and how to
906906
apply and follow the GNU AGPL, see &lt;
907-
<a target="_blank" href="https://www.gnu.org/licenses/" rel="noreferrer">
907+
<a
908+
target="_blank"
909+
href="https://www.gnu.org/licenses/"
910+
rel="noreferrer"
911+
>
908912
https://www.gnu.org/licenses/
909913
</a>
910914
&gt;.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ const ListTenants = ({
216216
};
217217

218218
const healthStatusToClass = (health_status: string) => {
219-
switch(health_status) {
219+
switch (health_status) {
220220
case "red":
221221
return classes.redState;
222222
case "yellow":

portal-ui/src/screens/Console/Tenants/ListTenants/types.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
import { LicenseInfo } from "../../License/types";
1818
import { IAffinityModel } from "../../../../common/types";
1919

20-
export interface ILog {
21-
log: string
20+
export interface IEvent {
21+
namespace: string;
22+
lastseen: number;
23+
message: string;
24+
eventtype: string;
25+
reason: string;
2226
}
2327

2428
export interface IPool {

0 commit comments

Comments
 (0)