Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1803666: do not show stale vmis in the vm list #4356

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Bug 1803666: do not show stale vmis in the vm list #4356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 37 additions & 23 deletions frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import {
K8sEntityMap,
dimensifyHeader,
dimensifyRow,
getDeletetionTimestamp,
getOwnerReferences,
} from '@console/shared';
import { compareOwnerReference } from '@console/shared/src/utils/owner-references';
import { NamespaceModel, PodModel, NodeModel } from '@console/internal/models';
import { Table, MultiListPage, TableRow, TableData } from '@console/internal/components/factory';
import { FirehoseResult, Kebab, ResourceLink } from '@console/internal/components/utils';
Expand All @@ -25,7 +28,7 @@ import {
} from '../../models';
import { VMIKind, VMKind } from '../../types';
import { getMigrationVMIName, isMigrating } from '../../selectors/vmi-migration';
import { getBasicID, getLoadedData, getResource } from '../../utils';
import { buildOwnerReferenceForModel, getBasicID, getLoadedData, getResource } from '../../utils';
import { getVMStatus, VMStatus as VMStatusType } from '../../statuses/vm/vm';
import { getVMStatusSortString } from '../../statuses/vm/constants';
import { getVmiIpAddresses, getVMINodeName } from '../../selectors/vmi';
Expand Down Expand Up @@ -205,30 +208,41 @@ export const VirtualMachinesPage: React.FC<VirtualMachinesPageProps> = (props) =
);
const virtualMachines = _.unionBy(loadedVMs, loadedVMIs, getBasicID);

return virtualMachines.map((obj: VMILikeEntityKind) => {
const lookupID = getBasicID(obj);
const { vm, vmi } = isVM(obj)
? { vm: obj as VMKind, vmi: vmisLookup[lookupID] as VMIKind }
: { vm: null, vmi: obj as VMIKind };
return virtualMachines
.map((obj: VMILikeEntityKind) => {
const lookupID = getBasicID(obj);
const { vm, vmi } = isVM(obj)
? { vm: obj as VMKind, vmi: vmisLookup[lookupID] as VMIKind }
: { vm: null, vmi: obj as VMIKind };

const vmStatus = getVMStatus({ vm, vmi, pods: loadedPods, migrations: loadedMigrations });
const vmStatus = getVMStatus({ vm, vmi, pods: loadedPods, migrations: loadedMigrations });

return {
metadata: {
name: getName(obj),
namespace: getNamespace(obj),
vmStatus,
status: getVMStatusSortString(vmStatus),
node: getVMINodeName(vmi),
creationTimestamp: getCreationTimestamp(obj),
uid: getUID(obj),
lookupID,
},
vm,
vmi,
migration: migrationLookup[lookupID],
};
});
return {
metadata: {
name: getName(obj),
namespace: getNamespace(obj),
vmStatus,
status: getVMStatusSortString(vmStatus),
node: getVMINodeName(vmi),
creationTimestamp: getCreationTimestamp(obj),
uid: getUID(obj),
lookupID,
},
vm,
vmi,
migration: migrationLookup[lookupID],
};
})
.filter(({ vm, vmi }) => {
if (vm || !getDeletetionTimestamp(vmi)) {
return true;
}
const vmOwnerReference = buildOwnerReferenceForModel(VirtualMachineModel, getName(vmi));

return !(getOwnerReferences(vmi) || []).some((o) =>
compareOwnerReference(o, vmOwnerReference),
);
});
};

const createAccessReview = skipAccessReview ? null : { model: VirtualMachineModel, namespace };
Expand Down