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

[release-1.28] OCPBUGS-36975: Cherry-pick changes from containers/image/pull#2418 #8221

Merged
merged 1 commit into from
Jun 14, 2024
Merged

[release-1.28] OCPBUGS-36975: Cherry-pick changes from containers/image/pull#2418 #8221

merged 1 commit into from
Jun 14, 2024

Conversation

kwilczynski
Copy link
Member

What type of PR is this?

/kind bug
/assign kwilczynski

What this PR does / why we need it:

Manually cherry-pick changes from containers/image#2418 as these changes contain a fix that needs to be backported to CRI-O.

Related:

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

None

@kwilczynski kwilczynski requested a review from mrunalp as a code owner May 28, 2024 12:21
@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels May 28, 2024
@openshift-ci openshift-ci bot requested review from klihub and QiWang19 May 28, 2024 12:21
@kwilczynski kwilczynski changed the title Cherry-pick changes from containers/image/pull#2418 [WIP] Cherry-pick changes from containers/image/pull#2418 May 28, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 28, 2024
@kwilczynski kwilczynski changed the title [WIP] Cherry-pick changes from containers/image/pull#2418 [WIP] [release-1.28] Cherry-pick changes from containers/image/pull#2418 May 28, 2024
@kwilczynski
Copy link
Member Author

/approved

@kwilczynski
Copy link
Member Author

@cri-o/cri-o-maintainers, I could use more pair of eyes on this one.

There are some changes as the code base is slightly older than the one in #8219, for example, which means we should be extra careful with the backport, such that we don't break anything and also actually fix the vulnerability too. Hence the request for more eyes on the code.

/cc @mtrmac

@openshift-ci openshift-ci bot requested a review from mtrmac May 29, 2024 09:07
mtrmac
mtrmac reviewed May 29, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@kwilczynski
Copy link
Member Author

/hold

For the following to be merged first:

@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 31, 2024
@kwilczynski kwilczynski mentioned this pull request May 31, 2024
Merged
@kwilczynski
Cherry-pick changes from containers/image/pull#2418
09f8980 
Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
@kwilczynski kwilczynski changed the title [WIP] [release-1.28] Cherry-pick changes from containers/image/pull#2418 [release-1.28] Cherry-pick changes from containers/image/pull#2418 Jun 4, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 4, 2024
@kwilczynski
Copy link
Member Author

/retest

@kwilczynski
Copy link
Member Author

@cri-o/cri-o-maintainers, please have a look.

@kwilczynski
Copy link
Member Author

/retest

@haircommander
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 14, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kwilczynski

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 Jun 14, 2024
@kwilczynski
Copy link
Member Author

/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 Jun 14, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 745ee5b into cri-o:release-1.28 Jun 14, 2024
39 of 42 checks passed
@kwilczynski kwilczynski deleted the release-1.28 branch June 14, 2024 16:07
@kwilczynski kwilczynski changed the title [release-1.28] Cherry-pick changes from containers/image/pull#2418 [release-1.28] OCPBUGS-36975: Cherry-pick changes from containers/image/pull#2418 Jul 16, 2024
@openshift-ci-robot
Copy link

@kwilczynski: Jira Issue OCPBUGS-36975: All pull requests linked via external trackers have merged:

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

In response to this:

What type of PR is this?

/kind bug
/assign kwilczynski

What this PR does / why we need it:

Manually cherry-pick changes from containers/image#2418 as these changes contain a fix that needs to be backported to CRI-O.

Related:

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

None

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.

@kwilczynski
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@kwilczynski: Jira Issue OCPBUGS-36975 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

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.

akalenyu added a commit to akalenyu/containerized-data-importer that referenced this pull request Aug 5, 2024
@akalenyu
Bump containers/image
e119f79 
Follow other projects in syncing containers/image
with a fix - cri-o/cri-o#8221

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@akalenyu akalenyu mentioned this pull request Aug 5, 2024
Merged
kubevirt-bot pushed a commit to kubevirt/containerized-data-importer that referenced this pull request Aug 5, 2024
@akalenyu
Bump containers/image (#3365)
e903216 
Follow other projects in syncing containers/image
with a fix - cri-o/cri-o#8221

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtrmac mtrmac mtrmac left review comments

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@klihub klihub Awaiting requested review from klihub

@QiWang19 QiWang19 Awaiting requested review from QiWang19

Assignees

@kwilczynski kwilczynski

@haircommander haircommander

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kwilczynski @haircommander @openshift-ci-robot @mtrmac