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

[release-4.6] Bug 1886651: Fix subscription name issue for OCS #6880

Merged
merged 1 commit into from Oct 9, 2020
Merged

[release-4.6] Bug 1886651: Fix subscription name issue for OCS #6880

merged 1 commit into from Oct 9, 2020

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #6860

/assign bipuladh

Fix subscription name issue for OCS
e866d7f 
Signed-off-by: Kanika Murarka <kmurarka@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 8, 2020
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: An error was encountered searching for bug 1883847 on the Bugzilla server at https://bugzilla.redhat.com:

response code 500 not 200
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

[release-4.6] Bug 1883847: Fix subscription name issue for OCS

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the component/ceph Related to ceph-storage-plugin label Oct 8, 2020
@a2batic
Copy link
Contributor

a2batic commented Oct 9, 2020

/retitle [release-4.6] Bug 1886651: Fix subscription name issue for OCS

@openshift-ci-robot openshift-ci-robot changed the title [release-4.6] Bug 1883847: Fix subscription name issue for OCS [release-4.6] Bug 1886651: Fix subscription name issue for OCS Oct 9, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Oct 9, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1886651, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1883847 is in the state MODIFIED, which is one of the valid states (MODIFIED, VERIFIED)
  • dependent Bugzilla bug 1883847 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

[release-4.6] Bug 1886651: Fix subscription name issue for OCS

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bipuladh
Copy link
Contributor

bipuladh commented Oct 9, 2020

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bipuladh, openshift-cherrypick-robot

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 9, 2020
spadgett
spadgett reviewed Oct 9, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

Sorry, I know this merged in master, but I had a couple comments looking at the PR.

frontend/packages/ceph-storage-plugin/src/features.ts
);
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));
Copy link
Member

Choose a reason for hiding this comment

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

Substring match seems imprecise. Do we not know the full name?

Copy link
Contributor

@a2batic a2batic Oct 9, 2020 •
edited

Choose a reason for hiding this comment

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

@spadgett OCS CSV name changes every release, in the sense the version of OCS is added to the name, like ocs-operator.v4.6.0 for 4.6 etc, so we cannot check for full name here. Probably instead of substring, we can check with startsWith function.

Copy link
Member

Choose a reason for hiding this comment

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

I think that would be better 👍

frontend/packages/ceph-storage-plugin/src/features.ts
Comment on lines +106 to +107
const csvList: any = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
const csvItems = csvList.items as ClusterServiceVersionKind[];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const csvList: any = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
const csvItems = csvList.items as ClusterServiceVersionKind[];
const csvList = await fetchK8s<ListKind<ClusterServiceVersionKind>>(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
csvList.items.find(...);

@spadgett
Copy link
Member

spadgett commented Oct 9, 2020

We can address the comments in 4.7 and leave the 4.6 PR as-is since they're not major.

@a2batic a2batic mentioned this pull request Oct 9, 2020
Merged
@a2batic
Copy link
Contributor

a2batic commented Oct 9, 2020

We can address the comments in 4.7 and leave the 4.6 PR as-is since they're not major.

Thanks @spadgett, rasied the PR wrt to comments for 4.7.

@bparees bparees added the staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). label Oct 9, 2020
@bparees
Copy link

bparees commented Oct 9, 2020

group-lead approved for merge to 4.6.0

@openshift-merge-robot openshift-merge-robot merged commit a37ad18 into openshift:release-4.6 Oct 9, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1886651 has been moved to the MODIFIED state.

In response to this:

[release-4.6] Bug 1886651: Fix subscription name issue for OCS

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett spadgett added this to the v4.6.z milestone Nov 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett left review comments

@a2batic a2batic Awaiting requested review from a2batic

@gnehapk gnehapk Awaiting requested review from gnehapk

Assignees

@bipuladh bipuladh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/ceph Related to ceph-storage-plugin lgtm Indicates that a PR is ready to be merged. staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead).
Projects
None yet
Milestone
v4.6.z
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@openshift-cherrypick-robot @openshift-ci-robot @a2batic @bipuladh @spadgett @bparees @openshift-merge-robot