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

Bug 1883595: Fix chart merging and show chart provider in catalog #6761

Merged
merged 2 commits into from Sep 30, 2020

Conversation

rohitkrai03
Copy link
Contributor

@rohitkrai03 rohitkrai03 commented Sep 28, 2020

Depends on: #6753

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

Analysis / Root cause: The helm charts were getting merged in backend for every chart repo. So, if there was a chart with same name coming from two different chart repos it would get merged and only come as one.

Solution Description: #6753 updates the merging logic and adds chart repo name to the key for each chart entry in index.yaml. UI parses this chart repo name from the key to display chart repo name as provider for the catalog item. Also updated the version merging logic.

This PR also changes the way we handle chart versions on install/upgrade form.

  • Added extra information of chart repo name (Provided by Chart Repo Name)
  • For Install form we get the chart repo name from the catalog as URL param and we use that to render the version dropdown items.
  • In case of upgrade form we have no information about the chart repo so we show all the chart versions from all the repos with repo name added to the dropdown item.

Screen shots / Gifs for design review:

@openshift/team-devconsole-ux @rachael-phillips @parvathyvr @serenamarie125

Peek 2020-09-29 17-01

Peek 2020-09-28 21-37

Unit test coverage report:

Screenshot from 2020-09-29 18-15-54

image

Test setup:

Build master with #6753

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

@openshift-ci-robot openshift-ci-robot added the component/core Related to console core functionality label Sep 28, 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 Sep 28, 2020
@rohitkrai03
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2020
@openshift-ci-robot openshift-ci-robot added component/dev-console Related to dev-console component/shared Related to console-shared labels Sep 29, 2020
@divyanshiGupta
Copy link
Contributor

@rohitkrai03 Tried it out locally, works fine for me. Will add LGTM once we have UX approval.

Copy link

@parvathyvr parvathyvr left a comment

Choose a reason for hiding this comment

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

lgtm!

@rachael-phillips
Copy link

lgtm!

@divyanshiGupta
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: divyanshiGupta, parvathyvr, rohitkrai03

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

@rohitkrai03 rohitkrai03 changed the title Fix chart merging and show chart provider in catalog Bug 1883595: Fix chart merging and show chart provider in catalog Sep 29, 2020
@openshift-ci-robot
Copy link
Contributor

@rohitkrai03: This pull request references Bugzilla bug 1883595, 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.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)

In response to this:

Bug 1883595: Fix chart merging and show chart provider in catalog

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 bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 Sep 29, 2020
@rohitkrai03
Copy link
Contributor Author

/retest

@rohitkrai03
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 30, 2020
@openshift-merge-robot openshift-merge-robot merged commit c081f28 into openshift:master Sep 30, 2020
@openshift-ci-robot
Copy link
Contributor

@rohitkrai03: All pull requests linked via external trackers have merged:

Bugzilla bug 1883595 has been moved to the MODIFIED state.

In response to this:

Bug 1883595: Fix chart merging and show chart provider in catalog

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 milestone Sep 30, 2020
@rohitkrai03 rohitkrai03 deleted the helm-provider-fix branch July 24, 2021 06:57
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. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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/core Related to console core functionality component/dev-console Related to dev-console component/shared Related to console-shared 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