Bug 1822112: include OpenShift Project as part of deployImage flow #5196

invincibleJai · 2020-04-27T13:29:16Z

Fixes:
https://issues.redhat.com/browse/ODC-3523

Analysis / Root cause:
The "openshift" has been always there to provide templates and images, user can use those via CLI but can't fetch images in deploy image flow from DevConsole

Solution Description:
include OpenShift Project as part of deployImage flow irrespective of user-role

Screen shots / Gifs for design review:

Browser conformance:

Chrome
Firefox
Safari
Edge

openshift-ci-robot · 2020-04-27T13:29:22Z

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1822112: include OpenShift Project as part of deployImage flow

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 · 2020-04-27T13:32:50Z

@invincibleJai: This pull request references Bugzilla bug 1822112, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1822112: include OpenShift Project as part of deployImage flow

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.

sahil143 · 2020-04-27T16:25:00Z

frontend/packages/console-shared/src/components/formik-fields/ResourceDropdownField.tsx

@@ -22,6 +22,7 @@ export interface ResourceDropdownFieldProps extends DropdownFieldProps {
    actionTitle: string;
    actionKey: string;
  }[];
+  appendItems?: object;


Suggested change

appendItems?: object;

appendItems?: { [key: string] : string };

sahil143 · 2020-04-27T16:25:09Z

frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx

@@ -66,6 +66,7 @@ interface ResourceDropdownProps {
  onLoad?: (items: { [key: string]: string }) => void;
  showBadge?: boolean;
  autocompleteFilter?: (strText: string, item: object) => boolean;
+  appendItems?: object;


same as above

karthikjeeyar · 2020-04-28T08:36:33Z

frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx

  onLoad?: (items: { [key: string]: string }) => void;
  showBadge?: boolean;
  autocompleteFilter?: (strText: string, item: object) => boolean;
+  appendItems?: { [key: string]: string | React.ReactElement };


can we could extract this as a ResourceDropdownItemsType and use it in other places like onLoad for consistency

karthikjeeyar · 2020-04-28T09:25:19Z

Openshift namespace has a lot of imagestreams in it but in my opinion we should show only the builder images in the list because thats how 3.11 shows at the moment.
eg:

invincibleJai · 2020-04-28T10:44:05Z

Openshift namespace has a lot of imagestreams in it but in my opinion we should show only the builder images in the list because thats how 3.11 shows at the moment.
eg:

@karthikjeeyar i don
t think we should filter based on builder images as in 3.11 i verified , all imageStreams are shown there and even in BZ redis is mentioned which is not a builder image

karthikjeeyar · 2020-04-29T08:04:19Z

Verified locally and it works fine with limited permissions as well
/lgtm

sahil143

/lgtm

invincibleJai · 2020-04-29T11:07:58Z

Thanks @karthikjeeyar @sahil143

/assign @christianvogt

christianvogt · 2020-04-29T19:53:59Z

frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx

    }: ResourceDropdownProps,
    updateSelection: boolean,
  ) => {
-    const unsortedList = {};
+    let unsortedList = {};


Can you not simply init the list upfront?

Suggested change

let unsortedList = {};

const unsortedList = { ...appendItems };

christianvogt · 2020-04-29T19:54:20Z

frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx

+    _.keys(appendItems).forEach((key) => {
+      if (!_.has(unsortedList, key)) {
+        unsortedList = { ...unsortedList, ...{ [key]: appendItems[key] } };
+      }
+    });


Unnecessary if you init unsortedList with appendItems

Thanks , have updated

… access to ns

christianvogt · 2020-05-04T16:25:13Z

/lgtm
/approve

openshift-ci-robot · 2020-05-04T16:25:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: christianvogt, invincibleJai, karthikjeeyar, sahil143

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/OWNERS~~ [christianvogt]

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 · 2020-05-04T23:27:49Z

@invincibleJai: All pull requests linked via external trackers have merged: openshift/console#5196. Bugzilla bug 1822112 has been moved to the MODIFIED state.

In response to this:

Bug 1822112: include OpenShift Project as part of deployImage flow

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.

invincibleJai · 2020-05-27T05:40:25Z

/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-05-27T05:40:29Z

@invincibleJai: #5196 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx
M	frontend/packages/console-shared/src/components/formik-fields/ResourceDropdownField.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/console-shared/src/components/formik-fields/ResourceDropdownField.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/formik-fields/ResourceDropdownField.tsx
Auto-merging frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/dropdown/ResourceDropdown.tsx
Patch failed at 0001 include OpenShift ns for picking up images for user role doesn't have access to ns

In response to this:

/cherry-pick release-4.4

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/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 27, 2020

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

openshift-ci-robot requested review from abhi-kn and jcaianirh April 27, 2020 13:29

openshift-ci-robot added component/dev-console Related to dev-console component/shared Related to console-shared labels Apr 27, 2020

sahil143 suggested changes Apr 27, 2020

View reviewed changes

invincibleJai force-pushed the add-openshift-namespace branch from 798c5d4 to feddd90 Compare April 28, 2020 08:24

karthikjeeyar reviewed Apr 28, 2020

View reviewed changes

invincibleJai force-pushed the add-openshift-namespace branch from feddd90 to 031e682 Compare April 28, 2020 10:41

openshift-ci-robot assigned karthikjeeyar Apr 29, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2020

sahil143 approved these changes Apr 29, 2020

View reviewed changes

openshift-ci-robot assigned sahil143 Apr 29, 2020

openshift-ci-robot assigned christianvogt Apr 29, 2020

christianvogt reviewed Apr 29, 2020

View reviewed changes

include OpenShift ns for picking up images for user role doesn't have…

45f52a1

… access to ns

invincibleJai force-pushed the add-openshift-namespace branch from 031e682 to 45f52a1 Compare April 30, 2020 05:54

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 4, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 4, 2020

openshift-merge-robot merged commit 7daf932 into openshift:master May 4, 2020

spadgett added this to the v4.5 milestone May 5, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1822112: include OpenShift Project as part of deployImage flow #5196

Bug 1822112: include OpenShift Project as part of deployImage flow #5196

invincibleJai commented Apr 27, 2020 •

edited

openshift-ci-robot commented Apr 27, 2020

openshift-ci-robot commented Apr 27, 2020

sahil143 Apr 27, 2020

invincibleJai Apr 28, 2020

sahil143 Apr 27, 2020

karthikjeeyar Apr 28, 2020

invincibleJai Apr 28, 2020

karthikjeeyar commented Apr 28, 2020 •

edited

invincibleJai commented Apr 28, 2020

karthikjeeyar commented Apr 29, 2020

sahil143 left a comment

invincibleJai commented Apr 29, 2020

christianvogt Apr 29, 2020

christianvogt Apr 29, 2020

invincibleJai Apr 30, 2020

christianvogt commented May 4, 2020

openshift-ci-robot commented May 4, 2020

openshift-ci-robot commented May 4, 2020

invincibleJai commented May 27, 2020

openshift-cherrypick-robot commented May 27, 2020

	appendItems?: object;
	appendItems?: { [key: string] : string };

	let unsortedList = {};
	const unsortedList = { ...appendItems };

Bug 1822112: include OpenShift Project as part of deployImage flow #5196

Bug 1822112: include OpenShift Project as part of deployImage flow #5196

Conversation

invincibleJai commented Apr 27, 2020 • edited

openshift-ci-robot commented Apr 27, 2020

openshift-ci-robot commented Apr 27, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karthikjeeyar commented Apr 28, 2020 • edited

invincibleJai commented Apr 28, 2020

karthikjeeyar commented Apr 29, 2020

sahil143 left a comment

Choose a reason for hiding this comment

invincibleJai commented Apr 29, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

christianvogt commented May 4, 2020

openshift-ci-robot commented May 4, 2020

openshift-ci-robot commented May 4, 2020

invincibleJai commented May 27, 2020

openshift-cherrypick-robot commented May 27, 2020

invincibleJai commented Apr 27, 2020 •

edited

karthikjeeyar commented Apr 28, 2020 •

edited