Skip to content

Commit

Permalink
Fix subscription name issue for OCS
Browse files Browse the repository at this point in the history
Signed-off-by: Kanika Murarka <kmurarka@redhat.com>
  • Loading branch information
Kanika Murarka committed Oct 8, 2020
1 parent c7ac4bb commit 34a8905
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions frontend/packages/ceph-storage-plugin/src/features.ts
@@ -1,10 +1,13 @@
import * as _ from 'lodash';
import { Dispatch } from 'react-redux';
import { K8sResourceKind, k8sList, StorageClassResourceKind } from '@console/internal/module/k8s';
import { ClusterServiceVersionModel, SubscriptionModel } from '@console/operator-lifecycle-manager';
import { k8sList, StorageClassResourceKind } from '@console/internal/module/k8s';
import {
ClusterServiceVersionModel,
ClusterServiceVersionKind,
} from '@console/operator-lifecycle-manager';
import { setFlag } from '@console/internal/actions/features';
import { FeatureDetector } from '@console/plugin-sdk';
import { getAnnotations } from '@console/shared/src/selectors/common';
import { getAnnotations, getName } from '@console/shared/src/selectors/common';
import { fetchK8s } from '@console/internal/graphql/client';
import { StorageClassModel } from '@console/internal/models';
import { OCSServiceModel } from './models';
Expand All @@ -14,6 +17,7 @@ import {
ATTACHED_DEVICES_ANNOTATION,
RGW_PROVISIONER,
SECOND,
OCS_OPERATOR,
} from './constants';
import { OCSStorageClusterKind } from './types';

Expand Down Expand Up @@ -99,16 +103,10 @@ export const detectOCS: FeatureDetector = async (dispatch) => {

export const detectOCSSupportedFeatures: FeatureDetector = async (dispatch) => {
try {
const subscription = await fetchK8s<K8sResourceKind>(
SubscriptionModel,
'ocs-subscription',
CEPH_STORAGE_NAMESPACE,
);
const ocsCSV = await fetchK8s(
ClusterServiceVersionModel,
subscription?.status?.currentCSV,
CEPH_STORAGE_NAMESPACE,
);
const csvList = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
// eslint-disable-next-line dot-notation
const csvItems = csvList['items'] as ClusterServiceVersionKind[];
const ocsCSV = csvItems.find((obj) => getName(obj).includes(OCS_OPERATOR));

const support = getAnnotations(ocsCSV)[OCS_SUPPORT_ANNOTATION];
_.keys(OCS_SUPPORT_FLAGS).forEach((feature) => {
Expand Down

0 comments on commit 34a8905

Please sign in to comment.