Bug 1755699: Removes Add capacity option for other storage operators #2840

a2batic · 2019-09-26T07:16:58Z

Storage like Potworx shows Add Capacity which is only supported
for OCS, the PR checks for storage type before showing the option
Signed-off-by: Kanika kmurarka@redhat.com

Thanks @umangachapagain for pointers

openshift-ci-robot · 2019-09-26T07:17:00Z

@a2batic: This pull request references Bugzilla bug 1755699, which is invalid:

expected the bug to target the "4.3.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1755699: Removes Add capacity option for other storage

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 · 2019-09-26T07:17:14Z

@a2batic: This pull request references Bugzilla bug 1755699, which is invalid:

expected the bug to target the "4.3.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1755699: Removes Add capacity option for other storage

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.

a2batic · 2019-09-26T07:17:52Z

/assign @gnehapk @afreen23 @umangachapagain

a2batic · 2019-09-26T07:20:11Z

/bugzilla refresh

openshift-ci-robot · 2019-09-26T07:20:13Z

@a2batic: This pull request references Bugzilla bug 1755699, which is invalid:

expected the bug to target the "4.3.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

umangachapagain · 2019-09-26T07:36:27Z

This should fix the issue.
lgtm

gnehapk · 2019-09-26T08:14:02Z

/approve

gnehapk · 2019-09-26T08:15:26Z

/test e2e-aws-console-olm

a2batic · 2019-09-26T09:32:45Z

/test e2e-aws-console

cloudbehl · 2019-09-26T10:59:45Z

frontend/packages/operator-lifecycle-manager/src/components/operand.tsx

+    .filter(
+      (action) =>
+        action.properties.kind === selectedObj.kind &&
+        _.startsWith(selectedObj.apiVersion, 'ocs.openshift.io'),


Not in favor of hardcoding things in core components.

a2batic · 2019-09-26T11:39:00Z

/assign @rawagner @alecmerdler

afreen23 · 2019-09-26T14:17:42Z

frontend/packages/ceph-storage-plugin/src/plugin.ts

@@ -203,6 +203,7 @@ const plugin: Plugin<ConsumedExtensions> = [
    properties: {
      kind: 'StorageCluster',
      label: 'Add Capacity',
+      apiVersion: 'ocs.openshift.io',


Isnt this apiGroup ?

spadgett · 2019-09-26T14:19:09Z

/cherrypick release-4.2

openshift-cherrypick-robot · 2019-09-26T14:19:10Z

@spadgett: once the present PR merges, I will cherry-pick it on top of release-4.2 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.2

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 · 2019-09-26T14:19:42Z

/bugzilla refresh

openshift-ci-robot · 2019-09-26T14:19:48Z

@spadgett: This pull request references Bugzilla bug 1755699, 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.

In response to this:

/bugzilla refresh

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 · 2019-09-26T14:21:07Z

frontend/packages/console-plugin-sdk/src/typings/clusterserviceversions.ts

@@ -7,6 +7,8 @@ namespace ExtensionProperties {
    kind: K8sResourceKindReference;
    /** label of action */
    label: string;
+    /** Storage type */


/** API group of the resource */ apiGroup: string;

spadgett · 2019-09-26T14:22:36Z

frontend/packages/operator-lifecycle-manager/src/components/operand.tsx

+    .filter(
+      (action) =>
+        action.properties.kind === selectedObj.kind &&
+        _.startsWith(selectedObj.apiVersion, action.properties.apiVersion),


Don't use startsWith since it could incorrectly match a substring. Use groupVersionFor

Suggested change

_.startsWith(selectedObj.apiVersion, action.properties.apiVersion),

groupVersionFor(selectedObj).group === action.properties.apiGroup

spadgett · 2019-09-26T14:23:44Z

/assign
/unassign @alecmerdler

Storage like Potworx shows `Add Capacity` which is only supported for OCS, the PR checks for storage type before showing the option Signed-off-by: Kanika <kmurarka@redhat.com>

a2batic · 2019-09-26T17:46:02Z

@spadgett Thanks for the review, addressed review comments, please review.

spadgett

/approve
/lgtm

openshift-ci-robot · 2019-09-26T17:52:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a2batic, gnehapk, spadgett

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:

~~frontend/packages/ceph-storage-plugin/OWNERS~~ [gnehapk,spadgett]
~~frontend/packages/console-plugin-sdk/OWNERS~~ [spadgett]
~~frontend/packages/operator-lifecycle-manager/OWNERS~~ [spadgett]

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 · 2019-09-27T00:06:12Z

@a2batic: All pull requests linked via external trackers have merged. Bugzilla bug 1755699 has been moved to the MODIFIED state.

In response to this:

Bug 1755699: Removes Add capacity option for other storage operators

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-cherrypick-robot · 2019-09-27T00:06:15Z

@spadgett: #2840 failed to apply on top of branch "release-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	frontend/packages/ceph-storage-plugin/src/plugin.ts
A	frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): frontend/packages/operator-lifecycle-manager/src/components/operand.tsx deleted in HEAD and modified in Bug 1755699: Removes Add capacity option for other storage operators. Version Bug 1755699: Removes Add capacity option for other storage operators of frontend/packages/operator-lifecycle-manager/src/components/operand.tsx left in tree.
Auto-merging frontend/packages/ceph-storage-plugin/src/plugin.ts
Patch failed at 0001 Bug 1755699: Removes Add capacity option for other storage operators

In response to this:

/cherrypick release-4.2

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 26, 2019

openshift-ci-robot requested review from jeff-phillips-18 and spadgett September 26, 2019 07:17

openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 26, 2019

openshift-ci-robot added the component/olm Related to OLM label Sep 26, 2019

openshift-ci-robot assigned afreen23, gnehapk and umangachapagain Sep 26, 2019

a2batic force-pushed the option-bug branch from 761eec9 to 33532ac Compare September 26, 2019 08:28

a2batic changed the title ~~Bug 1755699: Removes Add capacity option for other storage~~ Bug 1755699: Removes Add capacity option for other storage operators Sep 26, 2019

cloudbehl reviewed Sep 26, 2019

View reviewed changes

a2batic force-pushed the option-bug branch from 33532ac to 50a6e2c Compare September 26, 2019 11:18

openshift-ci-robot added component/ceph Related to ceph-storage-plugin component/sdk Related to console-plugin-sdk labels Sep 26, 2019

a2batic requested a review from cloudbehl September 26, 2019 11:38

openshift-ci-robot assigned alecmerdler and rawagner Sep 26, 2019

afreen23 reviewed Sep 26, 2019

View reviewed changes

spadgett added this to the v4.3 milestone Sep 26, 2019

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 26, 2019

openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 26, 2019

spadgett requested changes Sep 26, 2019

View reviewed changes

openshift-ci-robot assigned spadgett and unassigned alecmerdler Sep 26, 2019

Bug 1755699: Removes Add capacity option for other storage operators

08285e2

Storage like Potworx shows `Add Capacity` which is only supported for OCS, the PR checks for storage type before showing the option Signed-off-by: Kanika <kmurarka@redhat.com>

a2batic force-pushed the option-bug branch from 50a6e2c to 08285e2 Compare September 26, 2019 17:42

openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 26, 2019

a2batic requested review from spadgett and afreen23 September 26, 2019 17:45

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2019

spadgett approved these changes Sep 26, 2019

View reviewed changes

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 26, 2019

openshift-merge-robot merged commit 4aa5a64 into openshift:master Sep 27, 2019

a2batic mentioned this pull request Sep 30, 2019

[release-4.2] Bug 1755980: Removes Add capacity option for other storage operators #2863

Merged

afreen23 mentioned this pull request Feb 25, 2020

Bug 1801584: Fixed Inconsistency in kebab and actions menu for storage cluster #4352

Merged

Bug 1755699: Removes Add capacity option for other storage operators #2840

Bug 1755699: Removes Add capacity option for other storage operators #2840

a2batic commented Sep 26, 2019 •

edited

openshift-ci-robot commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

a2batic commented Sep 26, 2019

a2batic commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

umangachapagain commented Sep 26, 2019

gnehapk commented Sep 26, 2019

gnehapk commented Sep 26, 2019

a2batic commented Sep 26, 2019

cloudbehl Sep 26, 2019

a2batic Sep 26, 2019

a2batic commented Sep 26, 2019

afreen23 Sep 26, 2019

a2batic Sep 26, 2019

spadgett commented Sep 26, 2019

openshift-cherrypick-robot commented Sep 26, 2019

spadgett commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

spadgett Sep 26, 2019

a2batic Sep 26, 2019

spadgett Sep 26, 2019 •

edited

a2batic Sep 26, 2019

spadgett commented Sep 26, 2019

a2batic commented Sep 26, 2019

spadgett left a comment

openshift-ci-robot commented Sep 26, 2019

openshift-ci-robot commented Sep 27, 2019

openshift-cherrypick-robot commented Sep 27, 2019

	_.startsWith(selectedObj.apiVersion, action.properties.apiVersion),
	groupVersionFor(selectedObj).group === action.properties.apiGroup

Bug 1755699: Removes Add capacity option for other storage operators #2840

Bug 1755699: Removes Add capacity option for other storage operators #2840

Conversation

a2batic commented Sep 26, 2019 • edited

openshift-ci-robot commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

a2batic commented Sep 26, 2019

a2batic commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

umangachapagain commented Sep 26, 2019

gnehapk commented Sep 26, 2019

gnehapk commented Sep 26, 2019

a2batic commented Sep 26, 2019

cloudbehl Sep 26, 2019

Choose a reason for hiding this comment

a2batic Sep 26, 2019

Choose a reason for hiding this comment

a2batic commented Sep 26, 2019

afreen23 Sep 26, 2019

Choose a reason for hiding this comment

a2batic Sep 26, 2019

Choose a reason for hiding this comment

spadgett commented Sep 26, 2019

openshift-cherrypick-robot commented Sep 26, 2019

spadgett commented Sep 26, 2019

openshift-ci-robot commented Sep 26, 2019

spadgett Sep 26, 2019

Choose a reason for hiding this comment

a2batic Sep 26, 2019

Choose a reason for hiding this comment

spadgett Sep 26, 2019 • edited

Choose a reason for hiding this comment

a2batic Sep 26, 2019

Choose a reason for hiding this comment

spadgett commented Sep 26, 2019

a2batic commented Sep 26, 2019

spadgett left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Sep 26, 2019

openshift-ci-robot commented Sep 27, 2019

openshift-cherrypick-robot commented Sep 27, 2019

a2batic commented Sep 26, 2019 •

edited

spadgett Sep 26, 2019 •

edited