8000 [release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project by kwilczynski · Pull Request #8903 · cri-o/cri-o · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project #8903

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
Merged
merged 2 commits into from
Jan 22, 2025
Merged

[release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project #8903

merged 2 commits into from
Jan 22, 2025

Conversation

kwilczynski
Copy link
Contributor
@kwilczynski kwilczynski commented Jan 9, 2025 •
edited
Loading

What type of PR is this?

/kind bug
/assign kwilczynski

What this PR does / why we need it:

Manually cherry-pick changes from containers/storage project.

These changes carry fixes that need to be backported to CRI-O.

Related:

Note

This cherry-pick brings the following changes as a dependency:

commit b57566b9c3a5de2d1a0d8108666b4156b0e3e79e
Author: Krzysztof Wilczyński <kwilczynski@redhat.com>
Date:   Tue Jan 7 15:09:56 2025

    Update containernetworking/plugins Go package release to v1.6.2
    
    The upstream project pulled the release v1.6.1, which was allegedly
    incorectly released. The new version has been released in liu of the one
    that has been pulled.
    
    Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

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 January 9, 2025 03:11
@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. labels Jan 9, 2025
@openshift-ci openshift-ci bot requested review from hasan4791 and klihub January 9, 2025 03:11
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 9, 2025
@kwilczynski kwilczynski changed the title Cherry-pick changes from containers/storage project [release-1.32] Cherry-pick changes from containers/storage project Jan 9, 2025
@kwilczynski kwilczynski changed the title [release-1.32] Cherry-pick changes from containers/storage project [WIP] [release-1.32] Cherry-pick changes from containers/storage project Jan 9, 2025
@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 Jan 9, 2025
@kwilczynski
Copy link
Contributor Author

/cc @cri-o/cri-o-maintainers
/cc @giuseppe

@openshift-ci openshift-ci bot requested review from giuseppe and a team January 9, 2025 03:12
@kwilczynski kwilczynski changed the title [WIP] [release-1.32] Cherry-pick changes from containers/storage project [WIP] [release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project Jan 9, 2025
@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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 9, 2025
@openshift-ci-robot
Copy link

@kwilczynski: This pull request references Jira Issue OCPBUGS-48198, which is invalid:

  • expected Jira Issue OCPBUGS-48198 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

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

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

These changes carry fixes that need 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.

Update containernetworking/plugins Go package release to v1.6.2
b57566b 
The upstream project pulled the release v1.6.1, which was allegedly
incorectly released. The new version has been released in liu of the one
that has been pulled.

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
@kwilczynski kwilczynski force-pushed the feature/backport-updates-to-release-1.32 branch from 467c0bc to ad7c578 Compare January 9, 2025 03:25
@codecov Codecov
Copy link
codecov bot commented Jan 9, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.08%. Comparing base (e6ab043) to head (890c75c).
Report is 3 commits behind head on release-1.32.

Additional details and impacted files 
@@              Coverage Diff              @@
##           release-1.32    #8903   +/-   ##
=============================================
  Coverage         47.08%   47.08%           
=============================================
  Files               154      154           
  Lines             22138    22138           
=============================================
  Hits              10424    10424           
  Misses            10645    10645           
  Partials           1069     1069

@kwilczynski
Copy link
Contributor Author

/retest

hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 11, 2025
@hswong3i
alvistack/v1.32.0
a0e16fb 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.32.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.32.0-1.spec
    cp ../cri-o*1.32.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.32.0/
    rm -rf ../cri-o*1.32.0*.*

See cri-o#8867
See cri-o#8868
See cri-o#8902
See cri-o#8903

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/ansible-role-cri_o that referenced this pull request Jan 11, 2025
@hswong3i
https://github.com/alvistack/cri-o-cri-o/commit/a0e16fbeb3a9cee4dce37…
7d3b998 
…a191585accdedc6e382

See cri-o/cri-o#8867
See cri-o/cri-o#8868
See cri-o/cri-o#8902
See cri-o/cri-o#8903

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 18, 2025
@hswong3i
alvistack/v1.32.0
9a9ba85 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.32.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.32.0-1.spec
    cp ../cri-o*1.32.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.32.0/
    rm -rf ../cri-o*1.32.0*.*

See cri-o#8867
See cri-o#8868
See cri-o#8902
See cri-o#8903

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Cherry-pick changes from containers/storage project
890c75c 
Cherry-pick the following changes:

  - containers/storage/pull#2162
  - containers/storage/pull#2185

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
@kwilczynski kwilczynski force-pushed the feature/backport-updates-to-release-1.32 branch from ad7c578 to 890c75c Compare January 22, 2025 09:35
@kwilczynski kwilczynski changed the title [WIP] [release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project [release-1.32] OCPBUGS-48198: Cherry-pick changes from containers/storage project Jan 22, 2025
@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 Jan 22, 2025
sohankunkerkar
sohankunkerkar approved these changes Jan 22, 2025
View reviewed changes
Copy link
Member
@sohankunkerkar sohankunkerkar left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2025
@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jan 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [kwilczynski,sohankunkerkar]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 22a9592 into cri-o:release-1.32 Jan 22, 2025
48 of 49 checks passed
@openshift-ci-robot
Copy link

@kwilczynski: Jira Issue OCPBUGS-48198: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-48198 has not 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/storage project.

These changes carry fixes that need to be backported to CRI-O.

Related:

[!NOTE]
This cherry-pick brings the following changes as a dependency:

commit b57566b9c3a5de2d1a0d8108666b4156b0e3e79e
Author: Krzysztof Wilczyński <kwilczynski@redhat.com>
Date:   Tue Jan 7 15:09:56 2025

    Update containernetworking/plugins Go package release to v1.6.2
    
    The upstream project pulled the release v1.6.1, which was allegedly
    incorectly released. The new version has been released in liu of the one
    that has been pulled.
    
    Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

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 kwilczynski deleted the feature/backport-updates-to-release-1.32 branch January 27, 2025 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sohankunkerkar sohankunkerkar 8781 sohankunkerkar approved these changes

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

@hasan4791 hasan4791 Awaiting requested review from hasan4791

@klihub klihub Awaiting requested review from klihub

@giuseppe giuseppe Awaiting requested review from giuseppe

Assignees

@kwilczynski kwilczynski

@sohankunkerkar sohankunkerkar

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. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. 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. 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.
3 participants
@kwilczynski @openshift-ci-robot @sohankunkerkar
0