Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo #6753

pedjak · 2020-09-26T18:53:19Z

The introduced convention enables that all charts with the same name, but
in different source Helm repo, appear in the aggregated index file under
the name following the pattern: foo-chart--my-repo, where my-repo is the name
of HelmChartRepository available in the cluster.

…rce Helm repo The introduced convention enables that all charts with the same name, but in different source Helm repo, appear in the aggregated index file under the name following the pattern: `foo-chart--my-repo`, where `my-repo` is the name of `HelmChartRepository` available in the cluster.

openshift-ci-robot · 2020-09-26T18:54:22Z

@pedjak: This pull request references Bugzilla bug 1880246, which is invalid:

expected the bug to target the "4.6.0" release, but it targets "4.7.0" 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 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo

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.

pedjak · 2020-09-27T09:11:16Z

/retest

pedjak · 2020-09-28T05:17:44Z

/bugzilla refresh

openshift-ci-robot · 2020-09-28T05:17:50Z

@pedjak: This pull request references Bugzilla bug 1880246, 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:

/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.

rohitkrai03 · 2020-09-28T12:30:29Z

pkg/helm/chartproxy/proxy.go

 	for _, helmRepo := range helmRepos {
 		idxFile, err := helmRepo.IndexFile()
 		if err != nil {
 			return nil, err
 		}
-		indexFiles = append(indexFiles, idxFile)
+		for key, entry := range idxFile.Entries {
+			indexFile.Entries[key+"--"+helmRepo.Name] = entry


Maybe we add '~~' as a delimiter between the two names to make it more unique?

Suggested change

indexFile.Entries[key+"--"+helmRepo.Name] = entry

indexFile.Entries[key+"~~"+helmRepo.Name] = entry

this char is not alowed - only letters, digits and dash

Okay, no problem.

akashshinde · 2020-09-29T09:42:00Z

/lgtm

pedjak · 2020-09-29T09:49:22Z

/hold

rohitkrai03

Looks good to me. Tested the backend changes with UI changes in #6761. Works well.

openshift-ci-robot · 2020-09-29T13:10:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akashshinde, pedjak, 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:

~~docs/helm/OWNERS~~ [akashshinde,pedjak]
~~pkg/helm/OWNERS~~ [akashshinde,pedjak]

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

pedjak · 2020-09-29T13:41:05Z

/hold cancel

openshift-ci-robot · 2020-09-29T22:21:17Z

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

openshift/console#6753

Bugzilla bug 1880246 has been moved to the MODIFIED state.

In response to this:

Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo

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 component/backend Related to backend label Sep 26, 2020

openshift-ci-robot requested review from sbose78 and spadgett September 26, 2020 18:53

pedjak changed the title ~~Entry keys in aggregated Helm index are appended with the name of source Helm repo~~ Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo Sep 26, 2020

openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Sep 26, 2020

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, 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 Sep 28, 2020

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 28, 2020

rohitkrai03 suggested changes Sep 28, 2020

View reviewed changes

rohitkrai03 mentioned this pull request Sep 28, 2020

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

Merged

4 tasks

openshift-ci-robot assigned akashshinde Sep 29, 2020

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 29, 2020

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 29, 2020

rohitkrai03 approved these changes Sep 29, 2020

View reviewed changes

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 29, 2020

openshift-merge-robot merged commit 87d88d0 into openshift:master Sep 29, 2020

spadgett added this to the v4.6 milestone Sep 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo #6753

Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo #6753

pedjak commented Sep 26, 2020

openshift-ci-robot commented Sep 26, 2020

pedjak commented Sep 27, 2020

pedjak commented Sep 28, 2020

openshift-ci-robot commented Sep 28, 2020

rohitkrai03 Sep 28, 2020

pedjak Sep 28, 2020

rohitkrai03 Sep 28, 2020

akashshinde commented Sep 29, 2020

pedjak commented Sep 29, 2020

rohitkrai03 left a comment

openshift-ci-robot commented Sep 29, 2020

pedjak commented Sep 29, 2020

openshift-ci-robot commented Sep 29, 2020

	indexFile.Entries[key+"--"+helmRepo.Name] = entry
	indexFile.Entries[key+"~~"+helmRepo.Name] = entry

Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo #6753

Bug 1880246:Entry keys in aggregated Helm index are appended with the name of source Helm repo #6753

Conversation

pedjak commented Sep 26, 2020

openshift-ci-robot commented Sep 26, 2020

pedjak commented Sep 27, 2020

pedjak commented Sep 28, 2020

openshift-ci-robot commented Sep 28, 2020

rohitkrai03 Sep 28, 2020

Choose a reason for hiding this comment

pedjak Sep 28, 2020

Choose a reason for hiding this comment

rohitkrai03 Sep 28, 2020

Choose a reason for hiding this comment

akashshinde commented Sep 29, 2020

pedjak commented Sep 29, 2020

rohitkrai03 left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Sep 29, 2020

pedjak commented Sep 29, 2020

openshift-ci-robot commented Sep 29, 2020