8000 [release-1.32] Cherry-pick changes from containers/image project by kwilczynski · Pull Request #8902 · 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] Cherry-pick changes from containers/image project #8902

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 1 commit into from
Jan 23, 2025
Merged

[release-1.32] Cherry-pick changes from containers/image project #8902

merged 1 commit into from
Jan 23, 2025

Conversation

kwilczynski
Copy link
Contributor

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

@kwilczynski kwilczynski requested a review from mrunalp as a code owner January 9, 2025 02:41
@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 Jan 9, 2025
@openshift-ci openshift-ci bot requested review from klihub and QiWang19 January 9, 2025 02:41
@kwilczynski kwilczynski changed the title Cherry-pick changes from containers/image project [release-1.32] Cherry-pick changes from containers/image project Jan 9, 2025
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2025
@kwilczynski kwilczynski changed the title [release-1.32] Cherry-pick changes from containers/image project [WIP] [release-1.32] Cherry-pick changes from containers/image 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 @mtrmac

@openshift-ci openshift-ci bot requested review from mtrmac and a team January 9, 2025 02:41
@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 (22a9592) to head (fffe627).
Report is 4 commits behind head on release-1.32.

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

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>
@kwilczynski kwilczynski force-pushed the feature/backport-image-updates-to-release-1.32 branch from 961b067 to 99db209 Compare January 22, 2025 08:51
@kwilczynski kwilczynski changed the title [WIP] [release-1.32] Cherry-pick changes from containers/image project [release-1.32] Cherry-pick changes from containers/image 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

@sohankunkerkar
Copy link
Member

/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 Jan 22, 2025
@sohankunkerkar
Copy link
Member

I re-triggered the GitHub Actions as they were failing, to see if they pass this time.

@sohankunkerkar
Copy link
Member

@kwilczynski Does this PR also require a cniplugin version bump similar to b57566b

Cherry-pick changes from containers/image project
fffe627 
Cherry-pick the following changes:

  - containers/image/pull#2636
  - containers/image/pull#2643

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
@kwilczynski kwilczynski force-pushed the feature/backport-image-updates-to-release-1.32 branch from 99db209 to fffe627 Compare January 22, 2025 15:09
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2025
@kwilczynski
Copy link
Contributor Author

@kwilczynski Does this PR also require a cniplugin version bump similar to b57566b

@sohankunkerkar, no. This will be covered by a rebase since other merged change was against the same release branch.

sohankunkerkar
sohankunkerkar reviewed 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
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 23, 2025
@hswong3i
alvistack/v1.32.0
ef5bac6 
    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#8868
See cri-o#8902

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 23, 2025
@hswong3i
alvistack/v1.33.0
df0aef0 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.33.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.33.0-1.spec
    cp ../cri-o*1.33.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.33.0/
    rm -rf ../cri-o*1.33.0*.*

See cri-o#8868
See cri-o#8902

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
@sohankunkerkar
Copy link
Member

/hold cancel

@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 Jan 23, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 90f9f85 into cri-o:release-1.32 Jan 23, 2025
47 of 49 checks passed
@kwilczynski kwilczynski deleted the feature/backport-image-updates-to-release-1.32 branch January 24, 2025 05:25
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 31, 2025
@hswong3i
alvistack/v1.32.0
c1ca529 
    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#8868
See cri-o#8902

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 31, 2025
@hswong3i
alvistack/v1.33.0
1c68b74 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.33.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.33.0-1.spec
    cp ../cri-o*1.33.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.33.0/
    rm -rf ../cri-o*1.33.0*.*

See cri-o#8868
See cri-o#8902

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 Feb 1, 2025
@hswong3i
alvistack/v1.32.0
170bb33 
    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#8868
See cri-o#8902

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sohankunkerkar sohankunkerkar sohankunkerkar approved these changes

@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

@mtrmac mtrmac Awaiting requested review from mtrmac

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. 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.
2 participants
@kwilczynski @sohankunkerkar
0