Merge pull request #518 from spadgett/3.11-olm-feature-detection

[release-3.11] change OLM feature detection to look for 'operators.coreos.com' apigroup
openshift · Sep 11, 2018 · 4fa7d64 · 4fa7d64
2 parents 336423f + 7e31b51
commit 4fa7d64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/frontend/__tests__/features.spec.tsx b/frontend/__tests__/features.spec.tsx
@@ -16,7 +16,7 @@ describe('featureReducer', () => {
   });
 
   it('returns updated state with new flags if `SET_FLAG` action', () => {
-    const action = {type: 'SET_FLAG', flag: FLAGS.CLOUD_SERVICES, value: true};
+    const action = {type: 'SET_FLAG', flag: FLAGS.OPERATOR_LIFECYCLE_MANAGER, value: true};
     const initialState = Immutable.Map(DEFAULTS_);
     const newState = featureReducer(initialState, action);
 
@@ -31,7 +31,7 @@ describe('featureReducer', () => {
     expect(newState).toEqual(initialState);
   });
 
-  it('set flags when it gets CRDs', () => {
+  it('sets flags when it gets CRDs', () => {
     const action = {type: types.resources, resources: {models: [ClusterServiceVersionModel]}};
     const initialState = Immutable.Map(DEFAULTS_);
     const newState = featureReducer(initialState, action);
@@ -41,6 +41,7 @@ describe('featureReducer', () => {
       [FLAGS.PROMETHEUS]: false,
       [FLAGS.MULTI_CLUSTER]: false,
       [FLAGS.CHARGEBACK]: false,
+      [FLAGS.OPERATOR_LIFECYCLE_MANAGER]: true,
     }));
   });
 });

diff --git a/frontend/public/components/nav.jsx b/frontend/public/components/nav.jsx
@@ -375,7 +375,7 @@ export class Nav extends React.Component {
             <ResourceNSLink resource="events" name="Events" onClick={this.close} />
           </NavSection>
 
-          <NavSection required={FLAGS.CLOUD_SERVICES} text="Operators" img={operatorImg} activeImg={operatorActiveImg} >
+          <NavSection required={FLAGS.OPERATOR_LIFECYCLE_MANAGER} text="Operators" img={operatorImg} activeImg={operatorActiveImg} >
             <ResourceNSLink model={ClusterServiceVersionModel} resource={ClusterServiceVersionModel.plural} name="Cluster Service Versions" onClick={this.close} />
             <Sep />
             <ResourceNSLink model={CatalogSourceModel} resource={CatalogSourceModel.plural} name="Catalog Sources" onClick={this.close} />

diff --git a/frontend/public/features.ts b/frontend/public/features.ts
@@ -17,7 +17,7 @@ import { UIActions } from './ui/ui-actions';
   CLUSTER_UPDATES: false,
   PROMETHEUS: false,
   MULTI_CLUSTER: false,
-  CLOUD_SERVICES: false,
+  OPERATOR_LIFECYCLE_MANAGER: false,
   CALICO: false,
   CHARGEBACK: false,
   OPENSHIFT: false,
@@ -34,7 +34,7 @@ export enum FLAGS {
   CLUSTER_UPDATES = 'CLUSTER_UPDATES',
   PROMETHEUS = 'PROMETHEUS',
   MULTI_CLUSTER = 'MULTI_CLUSTER',
-  CLOUD_SERVICES = 'CLOUD_SERVICES',
+  OPERATOR_LIFECYCLE_MANAGER = 'OPERATOR_LIFECYCLE_MANAGER',
   CALICO = 'CALICO',
   CHARGEBACK = 'CHARGEBACK',
   OPENSHIFT = 'OPENSHIFT',
@@ -57,6 +57,7 @@ export const CRDs = {
   [referenceForModel(PrometheusModel)]: FLAGS.PROMETHEUS,
   [referenceForModel(ClusterModel)]: FLAGS.MULTI_CLUSTER,
   [referenceForModel(ChargebackReportModel)]: FLAGS.CHARGEBACK,
+  [referenceForModel(ClusterServiceVersionModel)]: FLAGS.OPERATOR_LIFECYCLE_MANAGER,
 };
 
 const SET_FLAG = 'SET_FLAG';
@@ -131,7 +132,6 @@ export let featureActions = [
   [FLAGS.CAN_LIST_PV, { resource: 'persistentvolumes', verb: 'list' }],
   [FLAGS.CAN_LIST_STORE, { group: 'storage.k8s.io', resource: 'storageclasses', verb: 'list' }],
   [FLAGS.CAN_LIST_CRD, { group: 'apiextensions.k8s.io', resource: 'customresourcedefinitions', verb: 'list' }],
-  [FLAGS.CLOUD_SERVICES, { group: ClusterServiceVersionModel.apiGroup, resource: ClusterServiceVersionModel.plural, verb: 'list' }],
 ].forEach(_.spread((FLAG, resourceAttributes) => {
   const req = {
     spec: { resourceAttributes }