Merge pull request openshift#7888 from SanjalKatiyar/fix_ocs_zone_label

Bug 1916882: OCS 4.7 wizard does not show zone when zone's are added manually
rexagod · Feb 5, 2021 · f35c8be · f35c8be
2 parents d40b17d + 570b133
commit f35c8be
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/node-list.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/node-list.tsx
@@ -14,9 +14,8 @@ import { humanizeCpuCores, ResourceLink } from '@console/internal/components/uti
 import { NodeKind } from '@console/internal/module/k8s';
 import { Table } from '@console/internal/components/factory';
 import { IRow, sortable } from '@patternfly/react-table';
-import { getConvertedUnits, nodesWithoutTaints } from '../../utils/install';
+import { getConvertedUnits, nodesWithoutTaints, getZone } from '../../utils/install';
 import { cephStorageLabel } from '../../selectors';
-import { ZONE_LABELS } from '../../constants';
 import { GetRows, NodeTableProps } from './types';
 import './ocs-install.scss';
 
@@ -45,7 +44,6 @@ const getRows: GetRows = (
     const roles = getNodeRoles(node).sort();
     const cpuSpec: string = getNodeCPUCapacity(node);
     const memSpec: string = getNodeAllocatableMemory(node);
-    const nodeLabels = node.metadata?.labels;
     const cells: IRow['cells'] = [
       {
         title: <ResourceLink kind="Node" name={getName(node)} title={getName(node)} />,
@@ -60,7 +58,7 @@ const getRows: GetRows = (
         title: `${getConvertedUnits(memSpec)}`,
       },
       {
-        title: nodeLabels[ZONE_LABELS[0]] || nodeLabels[ZONE_LABELS[1]] || '-',
+        title: getZone(node) || '-',
       },
     ];
     return {

diff --git a/.../local-storage-operator-plugin/src/components/local-volume-set/local-volume-set-inner.tsx b/.../local-storage-operator-plugin/src/components/local-volume-set/local-volume-set-inner.tsx
@@ -152,7 +152,7 @@ export const LocalVolumeSetInner: React.FC<LocalVolumeSetInnerProps> = ({
         data-test-id="create-lvs-form-advanced"
       >
         <FormGroup
-          label={t('lso-plugin~Disk Mode')}
+          label={t('lso-plugin~Volume Mode')}
           fieldId="create-lso-disk-mode-dropdown"
           className="lso-create-lvs__disk-mode-dropdown--margin"
         >

diff --git a/...es/local-storage-operator-plugin/src/components/local-volume-set/nodes-selection-list.tsx b/...es/local-storage-operator-plugin/src/components/local-volume-set/nodes-selection-list.tsx
@@ -19,8 +19,9 @@ import {
   getNodeAllocatableMemory,
 } from '@console/shared';
 import { useSelectList } from '@console/shared/src/hooks/select-list';
-import { hasNoTaints } from '../../utils';
+import { hasNoTaints, getZone } from '../../utils';
 import { GetRows } from './types';
+
 import './node-selection-list.scss';
 
 const tableColumnClasses = [
@@ -60,7 +61,7 @@ const getRows: GetRows = (
         title: roles.join(', ') ?? '-',
       },
       {
-        title: node.metadata.labels?.['failure-domain.beta.kubernetes.io/zone'] ?? '-',
+        title: getZone(node) || '-',
       },
       {
         title: `${humanizeCpuCores(cpuSpec).string || '-'}`,

diff --git a/frontend/packages/local-storage-operator-plugin/src/constants/index.ts b/frontend/packages/local-storage-operator-plugin/src/constants/index.ts
@@ -6,6 +6,11 @@ export const diskModeDropdownItems = Object.freeze({
   FILESYSTEM: 'Filesystem',
 });
 
+export const ZONE_LABELS = [
+  'topology.kubernetes.io/zone',
+  'failure-domain.beta.kubernetes.io/zone', // deprecated
+];
+
 export const DISK_TYPES: {
   [key: string]: {
     property: keyof typeof DiskMechanicalProperties;

diff --git a/frontend/packages/local-storage-operator-plugin/src/utils/index.ts b/frontend/packages/local-storage-operator-plugin/src/utils/index.ts
@@ -2,9 +2,13 @@ import * as _ from 'lodash';
 import { NodeKind, MatchExpression } from '@console/internal/module/k8s';
 import { NodeAffinityTerm, HostNamesMap } from '../components/auto-detect-volume/types';
 import { getName } from '@console/shared';
+import { ZONE_LABELS } from '../constants';
 
 export const hasNoTaints = (node: NodeKind): boolean => _.isEmpty(node.spec?.taints);
 
+export const getZone = (node: NodeKind) =>
+  node.metadata.labels?.[ZONE_LABELS[0]] || node.metadata.labels?.[ZONE_LABELS[1]];
+
 export const getNodes = (
   showNodes: boolean,
   allNodes: string[],