Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1883847: Fix subscription name issue for OCS #6860

Merged
merged 1 commit into from Oct 8, 2020
Merged

Bug 1883847: Fix subscription name issue for OCS #6860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 10 additions & 13 deletions frontend/packages/ceph-storage-plugin/src/features.ts
View file
Open in desktop
@@ -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,9 @@ 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: any = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
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