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.

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

Add feature guard for Multus #7419

Merged
merged 1 commit into from Dec 9, 2020

Conversation

bipuladh
Copy link
Contributor

@bipuladh bipuladh commented Dec 4, 2020

Screenshot from 2020-12-04 17-30-51
Screenshot from 2020-12-04 17-30-45
Screenshot from 2020-12-04 17-30-40

@openshift-ci-robot openshift-ci-robot added the component/ceph Related to ceph-storage-plugin label Dec 4, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 4, 2020
@bipuladh
Copy link
Contributor Author

bipuladh commented Dec 7, 2020

/retest

@bipuladh
Copy link
Contributor Author

bipuladh commented Dec 7, 2020

/retest

})
.catch(() => setClusterServiceVersion(null));
}, [appName, ns]);
const [infra, infraLoaded, infraError] = useK8sGet<any>(InfrastructureModel, 'cluster');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any since we don't have a type definition for InrastructureModel.

Copy link
Contributor

@afreen23 afreen23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks improved.
Thanks!

})
.catch(() => setClusterServiceVersion(null));
}, [appName, ns]);
const [infra, infraLoaded, infraError] = useK8sGet<any>(InfrastructureModel, 'cluster');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: place the use- hooks at one place

EXTERNAL: 'EXTERNAL',
MINIMAL_DEPLOYMENT: 'MINIMAL_DEPLOYMENT',
ENCRYPTION: 'ENCRYPTION',
MULTUS: 'MULTUS',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we name the flags something like OCS-MULTUS ? Just to differentiate with rest of the console flags.

@bipuladh bipuladh force-pushed the feature_gurads branch 2 times, most recently from 03c023a to 9b5a61c Compare December 9, 2020 10:52
Comment on lines 47 to 50
const csvResource = useDeepCompareMemoize<WatchK8sResource>(
{
kind: referenceForModel(ClusterServiceVersionModel),
name: appName,
namespace: ns,
isList: false,
},
true,
);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useK8sWatchResource already uses useDeepCompareMemoize.

Suggested change
const csvResource = useDeepCompareMemoize<WatchK8sResource>(
{
kind: referenceForModel(ClusterServiceVersionModel),
name: appName,
namespace: ns,
isList: false,
},
true,
);
const csvResource =
{
kind: referenceForModel(ClusterServiceVersionModel),
name: appName,
namespace: ns,
isList: false,
};

Refactor loading of CSV and Infrastruture in Install Page
@a2batic
Copy link
Contributor

a2batic commented Dec 9, 2020

/lgtm
Working fine for me

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a2batic, afreen23, bipuladh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit d0dcdac into openshift:master Dec 9, 2020
@spadgett spadgett added this to the v4.7 milestone Dec 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/ceph Related to ceph-storage-plugin lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants