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

Bug 1903033: deduplicate imageContentSources printed when mirroring release #661

Merged
merged 1 commit into from Dec 3, 2020
Merged

Bug 1903033: deduplicate imageContentSources printed when mirroring release #661

merged 1 commit into from Dec 3, 2020

Conversation

sallyom
Copy link
Contributor

@sallyom sallyom commented Dec 1, 2020

The recent oc adm release mirror fix to add the image sources for --to-release-image along with --to introduced a bug where it is possible to get duplicate image sources when --to and --to-release-image have the same registry/repo/name. This PR adds de-duplicate code to the printed image sources.

/assign @soltysh

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Dec 1, 2020
@openshift-ci-robot
Copy link

@sallyom: This pull request references Bugzilla bug 1903033, 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.7.0) matches configured target release for branch (4.7.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 1903033: deduplicate imageContentSources printed when mirroring release

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 1, 2020
@sallyom sallyom force-pushed the bz1903033-dupe-image-sources branch 4 times, most recently from 2a9cf91 to 7b29872 Compare December 2, 2020 05:22
soltysh
soltysh approved these changes Dec 2, 2020
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

One nit and you're good to go.
/approve

pkg/cli/admin/release/mirror.go Outdated
func dedupeSortSources(sources []operatorv1alpha1.RepositoryDigestMirrors) []operatorv1alpha1.RepositoryDigestMirrors {
unique := make(map[string][]string)
var uniqueSources []operatorv1alpha1.RepositoryDigestMirrors
var seenSources []string
Copy link
Member

Choose a reason for hiding this comment

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

You don't need this slice, since you can use the key from unique map to do just that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤦 thanks, brain over-working

pkg/cli/admin/release/mirror.go Show resolved Hide resolved
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2020
@sallyom sallyom force-pushed the bz1903033-dupe-image-sources branch from 7b29872 to 4123845 Compare December 3, 2020 05:52
soltysh
soltysh approved these changes Dec 3, 2020
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@soltysh
Copy link
Member

soltysh commented Dec 3, 2020

/retest

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sallyom, soltysh

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-merge-robot openshift-merge-robot merged commit 3d009d6 into openshift:master Dec 3, 2020
@openshift-ci-robot
Copy link

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

Bugzilla bug 1903033 has been moved to the MODIFIED state.

In response to this:

Bug 1903033: deduplicate imageContentSources printed when mirroring release

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sallyom @openshift-ci-robot @soltysh @openshift-merge-robot