Bug 1975696: compareOwnerReference should not accept a reference

openshift · Jun 24, 2021 · cf8bbb1 · cf8bbb1
1 parent f134a8a
commit cf8bbb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/frontend/packages/console-shared/src/utils/owner-references.ts b/frontend/packages/console-shared/src/utils/owner-references.ts
@@ -1,4 +1,4 @@
-import { kindForReference, OwnerReference } from '@console/internal/module/k8s';
+import { OwnerReference } from '@console/internal/module/k8s';
 
 export const compareOwnerReference = (
   obj: OwnerReference,
@@ -16,7 +16,7 @@ export const compareOwnerReference = (
 
   return (
     obj.apiVersion === otherObj.apiVersion &&
-    kindForReference(obj.kind) === kindForReference(otherObj.kind) &&
+    obj.kind === otherObj.kind &&
     isNameEqual &&
     isUIDEqual
   );

diff --git a/frontend/packages/kubevirt-plugin/src/k8s/wrapper/vm/combined-disk.ts b/frontend/packages/kubevirt-plugin/src/k8s/wrapper/vm/combined-disk.ts
@@ -6,10 +6,7 @@ import { compareOwnerReference } from '@console/shared/src/utils/owner-reference
 import { StorageUISource } from '../../../components/modals/disk-modal/storage-ui-source';
 import { AccessMode, DiskType, VolumeMode, VolumeType } from '../../../constants/vm/storage';
 import { DataVolumeModel } from '../../../models';
-import {
-  getKubevirtModelAvailableAPIVersion,
-  kubevirtReferenceForModel,
-} from '../../../models/kubevirtReferenceForModel';
+import { getKubevirtModelAvailableAPIVersion } from '../../../models/kubevirtReferenceForModel';
 import { getSimpleName } from '../../../selectors/utils';
 import { asVM, getDataVolumeTemplates } from '../../../selectors/vm';
 import { isWinToolsImage } from '../../../selectors/vm/winimage';
@@ -343,7 +340,7 @@ export class CombinedDiskFactory {
               (getOwnerReferences(p) || []).some((ownerReference) =>
                 compareOwnerReference(ownerReference, {
                   name: dataVolumeName,
-                  kind: kubevirtReferenceForModel(DataVolumeModel),
+                  kind: DataVolumeModel.kind,
                   apiVersion: getKubevirtModelAvailableAPIVersion(DataVolumeModel),
                 } as any),
               ),