Bug 1870339: Sets volumeMode as block for RBD+RWX

Signed-off-by: Kanika Murarka <kmurarka@redhat.com>
openshift · Sep 8, 2020 · 8b28904 · 8b28904
1 parent 2cb8b41
commit 8b28904
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx b/frontend/packages/console-app/src/components/modals/restore-pvc/restore-pvc-modal.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import * as _ from 'lodash';
 
 import { Form, FormGroup, Grid, GridItem, TextInput } from '@patternfly/react-core';
 import {
@@ -33,7 +34,10 @@ import {
 } from '@console/internal/models';
 import { getName, getNamespace, Status } from '@console/shared';
 import { StorageClassDropdown } from '@console/internal/components/utils/storage-class-dropdown';
-import { dropdownUnits } from '@console/internal/components/storage/shared';
+import {
+  dropdownUnits,
+  cephRBDProvisionerSuffix,
+} from '@console/internal/components/storage/shared';
 import { useK8sGet } from '@console/internal/components/utils/k8s-get-hook';
 
 import './restore-pvc-modal.scss';
@@ -50,6 +54,7 @@ const RestorePVCModal = withHandlePromise<RestorePVCModalProps>(
     const [requestedSize, setRequestedSize] = React.useState(defaultSize?.[0] ?? '');
     const [requestedUnit, setRequestedUnit] = React.useState(defaultSize?.[1] ?? 'Gi');
     const [pvcSC, setPVCStorageClass] = React.useState('');
+    const [storageProvisioner, setStorageProvisioner] = React.useState('');
     const namespace = getNamespace(resource);
     const snapshotName = getName(resource);
 
@@ -76,8 +81,10 @@ const RestorePVCModal = withHandlePromise<RestorePVCModalProps>(
       setRequestedUnit(unit);
     };
 
-    const handleStorageClass = (updatedStorageClass) =>
+    const handleStorageClass = (updatedStorageClass) => {
       setPVCStorageClass(updatedStorageClass?.metadata.name || '');
+      setStorageProvisioner(updatedStorageClass?.provisioner || '');
+    };
 
     const submit = (event: React.FormEvent<EventTarget>) => {
       event.preventDefault();
@@ -93,13 +100,12 @@ const RestorePVCModal = withHandlePromise<RestorePVCModalProps>(
           namespace,
         },
         spec: {
-          storageClassName: pvcSC,
           dataSource: {
             name: snapshotName,
             kind: VolumeSnapshotModel.kind,
             apiGroup: VolumeSnapshotModel.apiGroup,
           },
-          accessModes,
+          accessModes: [...accessModes],
           resources: {
             requests: {
               storage: `${requestedSize}${requestedUnit}`,
@@ -108,6 +114,18 @@ const RestorePVCModal = withHandlePromise<RestorePVCModalProps>(
         },
       };
 
+      if (pvcSC) {
+        restorePVCTemplate.spec.storageClassName = pvcSC;
+
+        // should set block only for RBD + RWX
+        if (
+          _.endsWith(storageProvisioner, cephRBDProvisionerSuffix) &&
+          accessModes[0] === 'ReadWriteMany'
+        ) {
+          restorePVCTemplate.spec.volumeMode = 'Block';
+        }
+      }
+
       // eslint-disable-next-line promise/catch-or-return
       handlePromise(
         k8sCreate(PersistentVolumeClaimModel, restorePVCTemplate, namespace),

diff --git a/frontend/public/module/k8s/types.ts b/frontend/public/module/k8s/types.ts
@@ -1113,7 +1113,7 @@ export type PersistentVolumeClaimKind = K8sResourceCommon & {
         storage: string;
       };
     };
-    storageClassName: string;
+    storageClassName?: string;
     volumeMode?: string;
     /* Parameters in a cloned PVC */
     dataSource?: {