Merge pull request #7249 from afreen23/bug-lvs-lvdr-request

Bug 1896511: Fix the request for lvs and lvd
openshift · Nov 18, 2020 · 4fbaf39 · 4fbaf39
2 parents bb652c4 + 8549d53
commit 4fbaf39
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/...ackages/local-storage-operator-plugin/integration-tests/tests/disks-list-page.scenario.ts b/...ackages/local-storage-operator-plugin/integration-tests/tests/disks-list-page.scenario.ts
@@ -10,7 +10,6 @@ import {
   checkDiskFilter,
   clearDiskFilter,
 } from '../views/disks-list-page.views';
-import { LOCAL_STORAGE_NAMESPACE } from '../../src/constants';
 import {
   LocalVolumeDiscoveryResultKind,
   DiskMetadata,
@@ -22,9 +21,7 @@ describe('Disk list is accessible from Nodes view', () => {
   let discoveredDevices: DiskMetadata[];
   beforeAll(async () => {
     const lvdrJson = JSON.parse(
-      execSync(
-        `kubectl get localvolumediscoveryresults -n ${LOCAL_STORAGE_NAMESPACE} -o json`,
-      ).toString(),
+      execSync(`kubectl get localvolumediscoveryresults -A -o json`).toString(),
     );
     const lvdr: LocalVolumeDiscoveryResultKind = lvdrJson.items[0];
     const { nodeName } = lvdr.spec;

diff --git a/...es/local-storage-operator-plugin/src/components/auto-detect-volume/auto-detect-volume.tsx b/...es/local-storage-operator-plugin/src/components/auto-detect-volume/auto-detect-volume.tsx
@@ -24,7 +24,6 @@ import { LocalVolumeDiscovery as AutoDetectVolumeModel } from '../../models';
 import { initialState, reducer } from './state';
 import {
   DISCOVERY_CR_NAME,
-  LOCAL_STORAGE_NAMESPACE,
   HOSTNAME_LABEL_KEY,
   AUTO_DISCOVER_ERR_MSG,
   LABEL_OPERATOR,
@@ -42,7 +41,7 @@ const AutoDetectVolume: React.FC = withHandlePromise<AutoDetectVolumeProps & Han
       event.preventDefault();
 
       handlePromise(
-        fetchK8s(AutoDetectVolumeModel, DISCOVERY_CR_NAME, LOCAL_STORAGE_NAMESPACE)
+        fetchK8s(AutoDetectVolumeModel, DISCOVERY_CR_NAME, ns)
           .then((discoveryRes: K8sResourceKind) => {
             const nodeSelectorTerms = discoveryRes?.spec?.nodeSelector?.nodeSelectorTerms;
             const [selectorIndex, expIndex] = nodeSelectorTerms
@@ -77,7 +76,7 @@ const AutoDetectVolume: React.FC = withHandlePromise<AutoDetectVolumeProps & Han
             if (err.message === AUTO_DISCOVER_ERR_MSG) {
               throw err;
             }
-            const requestData = getDiscoveryRequestData(state);
+            const requestData = getDiscoveryRequestData({ ...state, ns });
             return k8sCreate(AutoDetectVolumeModel, requestData);
           })
           // eslint-disable-next-line promise/catch-or-return

diff --git a/...local-storage-operator-plugin/src/components/auto-detect-volume/discovery-request-data.ts b/...local-storage-operator-plugin/src/components/auto-detect-volume/discovery-request-data.ts
@@ -1,11 +1,6 @@
 import { apiVersionForModel, K8sResourceCommon } from '@console/internal/module/k8s';
 import { LocalVolumeDiscovery as AutoDetectVolumeModel } from '../../models';
-import {
-  DISCOVERY_CR_NAME,
-  LOCAL_STORAGE_NAMESPACE,
-  HOSTNAME_LABEL_KEY,
-  LABEL_OPERATOR,
-} from '../../constants';
+import { DISCOVERY_CR_NAME, HOSTNAME_LABEL_KEY, LABEL_OPERATOR } from '../../constants';
 import { getNodes, getHostNames } from '../../utils';
 import { HostNamesMap } from './types';
 
@@ -14,17 +9,19 @@ export const getDiscoveryRequestData = ({
   allNodeNamesOnADV,
   showNodesListOnADV,
   hostNamesMapForADV,
+  ns,
 }: {
   nodeNamesForLVS: string[];
   allNodeNamesOnADV: string[];
   showNodesListOnADV: boolean;
   hostNamesMapForADV: HostNamesMap;
+  ns?: string;
 }): AutoDetectVolumeKind => {
   const nodes = getNodes(showNodesListOnADV, allNodeNamesOnADV, nodeNamesForLVS);
   return {
     apiVersion: apiVersionForModel(AutoDetectVolumeModel),
     kind: AutoDetectVolumeModel.kind,
-    metadata: { name: DISCOVERY_CR_NAME, namespace: LOCAL_STORAGE_NAMESPACE },
+    metadata: { name: DISCOVERY_CR_NAME, namespace: ns },
     spec: {
       nodeSelector: {
         nodeSelectorTerms: [

diff --git a/...local-storage-operator-plugin/src/components/local-volume-set/create-local-volume-set.tsx b/...local-storage-operator-plugin/src/components/local-volume-set/create-local-volume-set.tsx
@@ -46,7 +46,7 @@ const CreateLocalVolumeSet: React.FC = withHandlePromise<
   const onSubmit = (event: React.FormEvent<EventTarget>) => {
     event.preventDefault();
 
-    const requestData = getLocalVolumeSetRequestData(state);
+    const requestData = getLocalVolumeSetRequestData(state, ns);
 
     handlePromise(k8sCreate(LocalVolumeSetModel, requestData), () =>
       history.push(

diff --git a/...-storage-operator-plugin/src/components/local-volume-set/local-volume-set-request-data.ts b/...-storage-operator-plugin/src/components/local-volume-set/local-volume-set-request-data.ts
@@ -2,15 +2,15 @@ import { apiVersionForModel } from '@console/internal/module/k8s';
 import { LocalVolumeSetModel } from '../../models';
 import { LocalVolumeSetKind, DiskType, DiskMechanicalProperties } from './types';
 import { State } from './state';
-import { LOCAL_STORAGE_NAMESPACE, HOSTNAME_LABEL_KEY, LABEL_OPERATOR } from '../../constants';
+import { HOSTNAME_LABEL_KEY, LABEL_OPERATOR } from '../../constants';
 import { getNodes, getHostNames } from '../../utils';
 
-export const getLocalVolumeSetRequestData = (state: State): LocalVolumeSetKind => {
+export const getLocalVolumeSetRequestData = (state: State, ns?: string): LocalVolumeSetKind => {
   const nodes = getNodes(state.showNodesListOnLVS, state.nodeNamesForLVS, state.nodeNames);
   const requestData = {
     apiVersion: apiVersionForModel(LocalVolumeSetModel),
     kind: LocalVolumeSetModel.kind,
-    metadata: { name: state.volumeSetName, namespace: LOCAL_STORAGE_NAMESPACE },
+    metadata: { name: state.volumeSetName, namespace: ns },
     spec: {
       storageClassName: state.storageClassName || state.volumeSetName,
       volumeMode: state.diskMode,