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

OCPBUGS-33580: Fix shortestPath returning 3 times the same imageSet #856

Merged
merged 1 commit into from
May 30, 2024

Conversation

sherine-k
Copy link
Contributor

Description

When selecting the release nodes that correspond to the filtering, we were using a slice. duplicates nodes lead to mirroring the release content more than once.
The fix consists of using a map in order to reduce the quantity of images.
PS: this is a practice that we should consider more overall for all collectors in the future, as some images (kube-rbac-proxy for one) is used in multiple components and operators. WDYT?

Fixes #OCPBUGS-33580

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

mirroring the following imagesetconfig with or without shortestPath: true should lead to the same number of mirrored images.

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
  platform:
    channels:
    - name: stable-4.15                                             
      type: ocp
      minVersion: '4.15.11'
      maxVersion: '4.15.11'
      shortestPath: true

Expected Outcome

Success

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 16, 2024
@openshift-ci-robot
Copy link

@sherine-k: This pull request references Jira Issue OCPBUGS-33580, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @zhouying7780

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

When selecting the release nodes that correspond to the filtering, we were using a slice. duplicates nodes lead to mirroring the release content more than once.
The fix consists of using a map in order to reduce the quantity of images.
PS: this is a practice that we should consider more overall for all collectors in the future, as some images (kube-rbac-proxy for one) is used in multiple components and operators. WDYT?

Fixes #OCPBUGS-33580

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

mirroring the following imagesetconfig with or without shortestPath: true should lead to the same number of mirrored images.

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
 platform:
   channels:
   - name: stable-4.15                                             
     type: ocp
     minVersion: '4.15.11'
     maxVersion: '4.15.11'
     shortestPath: true

Expected Outcome

Success

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

openshift-ci bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sherine-k

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 16, 2024
@lmzuccarelli
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2024
@lmzuccarelli
Copy link
Contributor

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 29, 2024
@zhouying7780
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 30, 2024
@openshift-ci-robot openshift-ci-robot added jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 30, 2024
@openshift-ci-robot
Copy link

@sherine-k: This pull request references Jira Issue OCPBUGS-33580, which is invalid:

  • expected the bug to target either version "4.17." or "openshift-4.17.", but it targets "4.16.0" instead

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

In response to this:

Description

When selecting the release nodes that correspond to the filtering, we were using a slice. duplicates nodes lead to mirroring the release content more than once.
The fix consists of using a map in order to reduce the quantity of images.
PS: this is a practice that we should consider more overall for all collectors in the future, as some images (kube-rbac-proxy for one) is used in multiple components and operators. WDYT?

Fixes #OCPBUGS-33580

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

mirroring the following imagesetconfig with or without shortestPath: true should lead to the same number of mirrored images.

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
 platform:
   channels:
   - name: stable-4.15                                             
     type: ocp
     minVersion: '4.15.11'
     maxVersion: '4.15.11'
     shortestPath: true

Expected Outcome

Success

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 openshift-eng/jira-lifecycle-plugin repository.

@lmzuccarelli
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 30, 2024
@openshift-ci-robot
Copy link

@lmzuccarelli: This pull request references Jira Issue OCPBUGS-33580, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

@lmzuccarelli
Copy link
Contributor

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 30, 2024
@lmzuccarelli
Copy link
Contributor

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit e640610 into openshift:main May 30, 2024
2 of 5 checks passed
@openshift-ci-robot
Copy link

@sherine-k: Jira Issue OCPBUGS-33580: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-33580 has been moved to the MODIFIED state.

In response to this:

Description

When selecting the release nodes that correspond to the filtering, we were using a slice. duplicates nodes lead to mirroring the release content more than once.
The fix consists of using a map in order to reduce the quantity of images.
PS: this is a practice that we should consider more overall for all collectors in the future, as some images (kube-rbac-proxy for one) is used in multiple components and operators. WDYT?

Fixes #OCPBUGS-33580

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

mirroring the following imagesetconfig with or without shortestPath: true should lead to the same number of mirrored images.

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
 platform:
   channels:
   - name: stable-4.15                                             
     type: ocp
     minVersion: '4.15.11'
     maxVersion: '4.15.11'
     shortestPath: true

Expected Outcome

Success

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

openshift-ci bot commented May 30, 2024

@sherine-k: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build oc-mirror-plugin-container-v4.17.0-202405301013.p0.ge640610.assembly.stream.el9 for distgit oc-mirror-plugin.
All builds following this will include this PR.

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. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants