Merge master into master-4.3

frontend/__tests__/components/modals/configure-update-strategy-modal.spec.tsx

@@ -0,0 +1,37 @@
+import * as React from 'react';
+import { shallow, ShallowWrapper } from 'enzyme';
+import Spy = jasmine.Spy;
+
+import { ConfigureUpdateStrategy, ConfigureUpdateStrategyProps } from '@console/internal/components/modals/configure-update-strategy-modal';
+import { RadioInput } from '@console/internal/components/radio';
+
+describe(ConfigureUpdateStrategy.displayName, () => {
+  let wrapper: ShallowWrapper<ConfigureUpdateStrategyProps>;
+  let onChangeStrategyType: Spy;
+  let onChangeMaxSurge: Spy;
+  let onChangeMaxUnavailable: Spy;
+
+  beforeEach(() => {
+    onChangeStrategyType = jasmine.createSpy('onChangeStrategyType');
+    onChangeMaxSurge = jasmine.createSpy('onChangeMaxSurge');
+    onChangeMaxUnavailable = jasmine.createSpy('onChangeMaxUnavailable');
+
+    wrapper = shallow(<ConfigureUpdateStrategy onChangeStrategyType={onChangeStrategyType} onChangeMaxSurge={onChangeMaxSurge} onChangeMaxUnavailable={onChangeMaxUnavailable} strategyType="Recreate" maxSurge={null} maxUnavailable={null} />);
+  });
+
+  it('renders two choices for different update strategy types', () => {
+    expect(wrapper.find(RadioInput).at(0).props().value).toEqual('RollingUpdate');
+    expect(wrapper.find(RadioInput).at(1).props().value).toEqual('Recreate');
+    expect(wrapper.find(RadioInput).at(1).props().checked).toBe(true);
+  });
+
+  it('is a controlled component', () => {
+    wrapper.find(RadioInput).at(0).dive().find('input[type="radio"]').simulate('change', {target: {value: 'RollingUpdate'}});
+    wrapper.find('#input-max-unavailable').simulate('change', {target: {value: '25%'}});
+    wrapper.find('#input-max-surge').simulate('change', {target: {value: '50%'}});
+
+    expect(onChangeStrategyType.calls.argsFor(0)[0]).toEqual('RollingUpdate');
+    expect(onChangeMaxUnavailable.calls.argsFor(0)[0]).toEqual('25%');
+    expect(onChangeMaxSurge.calls.argsFor(0)[0]).toEqual('50%');
+  });
+});

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-card/capacity-card.tsx

@@ -94,7 +94,7 @@ export const CapacityCard: React.FC<DashboardItemProps & WithFlagsProps> = ({
   const statUsed: React.ReactText = getLastStats(storageUsed, getInstantVectorStats);
   const statTotal: React.ReactText = getLastStats(storageTotal, getInstantVectorStats);
   const infoText =
-    'Total capacity reflects the actual raw capacity of the OpenShift Container Storage cluster.  Used capacity reflects provisioned capacity which factors capacity being used to store user data and overhead from ensuring redundancy and reliability of the data.';
+    'Capacity includes the capacity being used to store user data and overhead from ensuring redundancy and reliability of the data.';
 
   return (
     <DashboardCard className="ceph-capacity-card__dashboard-card">

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/details-card.tsx

@@ -11,12 +11,13 @@ import {
   withDashboardResources,
 } from '@console/internal/components/dashboards-page/with-dashboard-resources';
 import { DetailsBody } from '@console/internal/components/dashboard/details-card/details-body';
-import { FirehoseResource } from '@console/internal/components/utils/index';
+import { FirehoseResource, FirehoseResult } from '@console/internal/components/utils/index';
 import { InfrastructureModel, SubscriptionModel } from '@console/internal/models/index';
 import { K8sResourceKind } from '@console/internal/module/k8s/index';
 import { getName } from '@console/shared/src/selectors/common';
 import { referenceForModel } from '@console/internal/module/k8s/k8s';
 import { CephClusterModel } from '../../../models';
+import { getOCSVersion } from '../../../selectors';
 
 const infrastructureResource: FirehoseResource = {
   kind: referenceForModel(InfrastructureModel),
@@ -37,8 +38,7 @@ const SubscriptionResource: FirehoseResource = {
   kind: referenceForModel(SubscriptionModel),
   namespaced: false,
   prop: 'subscription',
-  name: 'ocs-subscription',
-  isList: false,
+  isList: true,
 };
 
 const DetailsCard: React.FC<DashboardItemProps> = ({
@@ -67,9 +67,9 @@ const DetailsCard: React.FC<DashboardItemProps> = ({
   const cephClusterData = _.get(cephCluster, 'data') as K8sResourceKind[];
   const cephClusterName = getName(_.get(cephClusterData, 0));
 
-  const subscription = _.get(resources, 'subscription');
+  const subscription = _.get(resources, 'subscription') as FirehoseResult;
   const subscriptionLoaded = _.get(subscription, 'loaded');
-  const ocsVersion = _.get(subscription, 'data.status.currentCSV');
+  const ocsVersion = getOCSVersion(subscription);
 
   return (
     <DashboardCard>

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/top-consumers-card/top-consumers-card-body.tsx

@@ -61,7 +61,9 @@ export const TopConsumersBody: React.FC<TopConsumerBodyProps> = React.memo(
             padding={{ top: 20, bottom: 20, left: 40, right: 20 }}
             containerComponent={
               <ChartVoronoiContainer
-                labels={(datum) => `${datum.y} ${maxCapacityConverted.unit}`}
+                labels={(datum) =>
+                  `${datum.y} ${maxCapacityConverted.unit} at ${twentyFourHourTime(datum.x)}`
+                }
                 labelComponent={<ChartTooltip style={{ fontSize: 8, padding: 5 }} />}
               />
             }

frontend/packages/ceph-storage-plugin/src/components/ocs-install/create-form.tsx

@@ -24,14 +24,17 @@ export const CreateOCSServiceForm: React.FC<CreateOCSServiceFormProps> = (props)
         <div className="form-group co-create-route__name">
           <label htmlFor="select-node-help">Select Nodes</label>
           <p className="co-m-pane__explanation">
-            A minimum of 3 nodes needs to be labeled with{' '}
-            <code>cluster.ocs.openshift.io/openshift-storage=&quot;&quot;</code> in order to create
-            the OCS Service.
+            Selected nodes will be labeled with
+            <code>cluster.ocs.openshift.io/openshift-storage=&quot;&quot;</code> to create the OCS
+            Service. These nodes will also be tainted with
+            <code>node.ocs.openshift.io/storage=true:NoSchedule</code> to dedicate these nodes to
+            allow only OCS components to be scheduled on them. Note: Ensure you have additional
+            worker nodes that are not tainted to run other workloads in your OpenShift cluster.
           </p>
           <Alert
             className="co-alert"
             variant="info"
-            title="An AWS bucket will be created to provide the OCS Service."
+            title="A bucket will be created to provide the OCS Service."
             isInline
           />
           <p className="co-legend co-required ceph-ocs-desc__legend">

frontend/packages/ceph-storage-plugin/src/constants/index.ts

@@ -11,3 +11,4 @@ export const STORAGE_CLASSES = 'Storage Classes';
 export const PODS = 'Pods';
 export const BY_USED = 'By Used Capacity';
 export const BY_REQUESTED = 'By Requested Capacity';
+export const OCS_OPERATOR = 'ocs-operator';

frontend/packages/ceph-storage-plugin/src/selectors/index.ts

@@ -1,6 +1,8 @@
 import * as _ from 'lodash';
 import { Alert } from '@console/internal/components/monitoring';
 import { K8sResourceKind } from '@console/internal/module/k8s';
+import { FirehoseResult } from '@console/internal/components/utils';
+import { OCS_OPERATOR } from '../constants';
 
 const cephStorageProvisioners = ['ceph.rook.io/block', 'cephfs.csi.ceph.com', 'rbd.csi.ceph.com'];
 const cephStorageLabel = 'cluster.ocs.openshift.io/openshift-storage';
@@ -32,3 +34,12 @@ export const getCephSC = (scData: K8sResourceKind[]): K8sResourceKind[] =>
       _.get(sc, 'provisioner', '').includes(provisioner),
     );
   });
+
+export const getOCSVersion = (items: FirehoseResult): string => {
+  const itemsData: K8sResourceKind[] = _.get(items, 'data');
+  const operator: K8sResourceKind = _.find(
+    itemsData,
+    (item) => _.get(item, 'spec.name') === OCS_OPERATOR,
+  );
+  return _.get(operator, 'status.currentCSV');
+};

frontend/packages/dev-console/src/components/pipelines/PipelineDetails.tsx

@@ -1,39 +1,46 @@
 import * as React from 'react';
 import { SectionHeading, ResourceSummary, ResourceLink } from '@console/internal/components/utils';
-import { referenceForModel } from '@console/internal/module/k8s';
+import { referenceForModel, K8sResourceKind } from '@console/internal/module/k8s';
 import { TaskModel } from '../../models';
 import { PipelineVisualization } from './PipelineVisualization';
 
-const PipelineDetails = ({ obj: pipeline }) => (
+interface PipelineDetailsProps {
+  obj: K8sResourceKind;
+}
+
+const PipelineDetails: React.FC<PipelineDetailsProps> = ({ obj: pipeline }) => (
   <div className="co-m-pane__body">
     <SectionHeading text="Pipeline Overview" />
     <PipelineVisualization pipeline={pipeline} />
     <div className="row">
       <div className="col-sm-6">
         <ResourceSummary resource={pipeline} />
       </div>
-      <div className="col-sm-6">
-        <SectionHeading text="Tasks" />
-        <dl>
-          {pipeline.spec.tasks.map((task) => {
-            return (
-              <React.Fragment key={task.name}>
-                <dt>Name: {task.name}</dt>
-                <dd>
-                  Ref:{' '}
-                  <ResourceLink
-                    kind={referenceForModel(TaskModel)}
-                    name={task.taskRef.name}
-                    namespace={pipeline.metadata.namespace}
-                    title={task.taskRef.name}
-                    inline
-                  />
-                </dd>
-              </React.Fragment>
-            );
-          })}
-        </dl>
-      </div>
+      {pipeline.spec &&
+        (pipeline.spec.tasks && (
+          <div className="col-sm-6">
+            <SectionHeading text="Tasks" />
+            <dl>
+              {pipeline.spec.tasks.map((task) => {
+                return (
+                  <React.Fragment key={task.name}>
+                    <dt>Name: {task.name}</dt>
+                    <dd>
+                      Ref:{' '}
+                      <ResourceLink
+                        kind={referenceForModel(TaskModel)}
+                        name={task.taskRef.name}
+                        namespace={pipeline.metadata.namespace}
+                        title={task.taskRef.name}
+                        inline
+                      />
+                    </dd>
+                  </React.Fragment>
+                );
+              })}
+            </dl>
+          </div>
+        ))}
     </div>
   </div>
 );

frontend/packages/kubevirt-plugin/package.json

@@ -10,7 +10,7 @@
     "@console/internal": "0.0.0-fixed",
     "@console/plugin-sdk": "0.0.0-fixed",
     "@console/shared": "0.0.0-fixed",
-    "kubevirt-web-ui-components": "~0.1.42"
+    "kubevirt-web-ui-components": "~0.1.43"
   },
   "consolePlugin": {
     "entry": "src/plugin.tsx"

frontend/packages/noobaa-storage-plugin/src/components/details-card/details-card.tsx

@@ -12,9 +12,10 @@ import {
   DashboardItemProps,
   withDashboardResources,
 } from '@console/internal/components/dashboards-page/with-dashboard-resources';
-import { FirehoseResource, ExternalLink } from '@console/internal/components/utils';
+import { FirehoseResource, ExternalLink, FirehoseResult } from '@console/internal/components/utils';
 import { InfrastructureModel, SubscriptionModel } from '@console/internal/models/index';
 import { referenceForModel, K8sResourceKind } from '@console/internal/module/k8s';
+import { getOCSVersion } from '@console/ceph-storage-plugin/src/selectors';
 import { getMetric } from '../../utils';
 
 const NOOBAA_SYSTEM_NAME_QUERY = 'NooBaa_system_info';
@@ -31,8 +32,7 @@ const SubscriptionResource: FirehoseResource = {
   kind: referenceForModel(SubscriptionModel),
   namespaced: false,
   prop: 'subscription',
-  name: 'ocs-subscription',
-  isList: false,
+  isList: true,
 };
 
 export const ObjectServiceDetailsCard: React.FC<DashboardItemProps> = ({
@@ -66,9 +66,9 @@ export const ObjectServiceDetailsCard: React.FC<DashboardItemProps> = ({
   const infrastructureData = _.get(infrastructure, 'data') as K8sResourceKind;
   const infrastructurePlatform = getInfrastructurePlatform(infrastructureData);
 
-  const subscription = _.get(resources, 'subscription');
+  const subscription = _.get(resources, 'subscription') as FirehoseResult;
   const subscriptionLoaded = _.get(subscription, 'loaded');
-  const ocsVersion = _.get(subscription, 'data.status.currentCSV');
+  const ocsVersion = getOCSVersion(subscription);
 
   return (
     <DashboardCard>

frontend/packages/noobaa-storage-plugin/src/components/health-card/health-card.tsx

@@ -26,8 +26,7 @@ import { NooBaaSystemModel } from '../../models';
 
 const noobaaSystemResource: FirehoseResource = {
   kind: referenceForModel(NooBaaSystemModel),
-  namespaced: false,
-  isList: false,
+  isList: true,
   prop: 'noobaa',
 };
 
@@ -36,11 +35,26 @@ const getObjectStorageHealthState = (
   unhealthyBucketsResponse,
   poolsResponse,
   unhealthyPoolResponse,
-  noobaaSystemData,
+  noobaaSystem,
 ): ObjectStorageHealth => {
+  const loadError = _.get(noobaaSystem, 'loadError');
+  const loaded = _.get(noobaaSystem, 'loaded');
+  const noobaaSystemData = _.get(noobaaSystem, 'data[0]', null) as K8sResourceKind;
+  const noobaaPhase = _.get(noobaaSystemData, 'status.phase');
+
+  const buckets = getGaugeValue(bucketsResponse);
+  const unhealthyBuckets = getGaugeValue(unhealthyBucketsResponse);
+  const pools = getGaugeValue(poolsResponse);
+  const unhealthyPools = getGaugeValue(unhealthyPoolResponse);
+
+  const result: ObjectStorageHealth = {
+    message: 'Object Storage is healthy',
+    state: HealthState.OK,
+  };
+
   if (
     !(
-      noobaaSystemData &&
+      (loaded || loadError) &&
       bucketsResponse &&
       unhealthyBucketsResponse &&
       poolsResponse &&
@@ -49,17 +63,10 @@ const getObjectStorageHealthState = (
   ) {
     return { state: HealthState.LOADING };
   }
-  const buckets = getGaugeValue(bucketsResponse);
-  const unhealthyBuckets = getGaugeValue(unhealthyBucketsResponse);
-  const pools = getGaugeValue(poolsResponse);
-  const unhealthyPools = getGaugeValue(unhealthyPoolResponse);
-  const result: ObjectStorageHealth = {
-    message: 'Object Storage is healthy',
-    state: HealthState.OK,
-  };
-
-  let value;
-  if (_.isEmpty(noobaaSystemData)) {
+  if (loadError || !(buckets && unhealthyBuckets && pools && unhealthyPools)) {
+    return { message: null };
+  }
+  if (!noobaaSystemData || noobaaPhase !== 'Ready') {
     result.message = 'Multi cloud gateway is not running';
     result.state = HealthState.ERROR;
     return result;
@@ -72,7 +79,7 @@ const getObjectStorageHealthState = (
     }
   }
   if (!_.isNil(buckets) && !_.isNil(unhealthyBuckets)) {
-    value = Number(unhealthyBuckets) / Number(buckets);
+    const value = Number(unhealthyBuckets) / Number(buckets);
     if (value >= 0.5) {
       result.message = 'Many buckets have issues';
       result.state = HealthState.ERROR;
@@ -126,14 +133,14 @@ const HealthCard: React.FC<DashboardItemProps> = ({
     'result',
   ]);
 
-  const noobaaSystemData = _.get(resources.noobaa, 'data', null) as K8sResourceKind;
+  const noobaaSystem = _.get(resources, 'noobaa');
 
   const objectServiceHealthState = getObjectStorageHealthState(
     bucketsQueryResult,
     unhealthyBucketsQueryResult,
     poolsQueryResult,
     unhealthyPoolsQueryResult,
-    noobaaSystemData,
+    noobaaSystem,
   );
   const alerts = filterNooBaaAlerts(getAlerts(alertsResults));
 
@@ -144,10 +151,14 @@ const HealthCard: React.FC<DashboardItemProps> = ({
       </DashboardCardHeader>
       <DashboardCardBody isLoading={objectServiceHealthState.state === HealthState.LOADING}>
         <HealthBody>
-          <HealthItem
-            state={objectServiceHealthState.state}
-            message={objectServiceHealthState.message}
-          />
+          {objectServiceHealthState.message ? (
+            <HealthItem
+              state={objectServiceHealthState.state}
+              message={objectServiceHealthState.message}
+            />
+          ) : (
+            <span className="text-muted">Unavailable</span>
+          )}
         </HealthBody>
       </DashboardCardBody>
       {alerts.length > 0 && (
@@ -171,6 +182,6 @@ const HealthCard: React.FC<DashboardItemProps> = ({
 export default withDashboardResources(HealthCard);
 
 type ObjectStorageHealth = {
-  state: HealthState;
+  state?: HealthState;
   message?: string;
 };