Merge pull request #7748 from rawagner/dv_optional

Bug 1913560: Make DataVolumes and DV pods optional when fetching base images
openshift · Jan 7, 2021 · 644e302 · 644e302
2 parents 1c4ca45 + 7d57788
commit 644e302
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/frontend/packages/kubevirt-plugin/src/hooks/use-base-images.ts b/frontend/packages/kubevirt-plugin/src/hooks/use-base-images.ts
@@ -75,8 +75,10 @@ export const useBaseImages = (
     const dvValues = Object.values(dvs);
     const podValues = Object.values(pods);
 
-    const loaded = [...pvcValues, ...dvValues, ...podValues].every((value) => value.loaded);
-    const loadError = [...pvcValues, ...dvValues, ...podValues].find((value) => value.loadError);
+    const loaded = [...pvcValues, ...dvValues, ...podValues].every(
+      (value) => value.loaded || !!value.loadError,
+    );
+    const loadError = pvcValues.find((value) => value.loadError);
     const pvcData = pvcValues.reduce<PersistentVolumeClaimKind[]>(
       (acc, pvc) => acc.concat(pvc.data),
       [],