[v4.4.1-crio] Bump c/storage to 1.46.1

[TomSweeneyRedHat]

After discussions with @mheon today, we decided to create a new branch entitled v4.4.1-crio. The issue is seen only in OCP 4.12, later versions of OCP have an updated c/storage and don't run into this.

As this is not a change that we want to add to the 4.4.1-rhel stream, we decided to create a new branch.

This replaces: #20881

Addresses: https://issues.redhat.com/browse/OCPBUGS-17043

[NO NEW TESTS NEEDED]

Does this PR introduce a user-facing change?

None

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

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 [TomSweeneyRedHat]

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

[TomSweeneyRedHat]

@mheon and if you have time @vrothberg, PTAL

This is the first time that I've created a release-branch upstream from another one from upstream. Here are the git commands I used:

     git fetch --all
     git rebase upstream/main
     git checkout -b v4.4.1-crio
     git reset --hard b9594a7
     git push upstream v4.4.1-crio

b9594a7 is the top-level commit in the v4.4.1-rhel branch.

The above command created this PR: #21131, which I was not expecting and just created as a draft and summarily closed.

For this PR, I then bumped c/storage to v1.46.1. The only odd thing is the `make vendor-in-container' command somehow dragged in the file docs/source/markdown/podman-compose.1.md, and I'm not sure how that was possibly pulled in during the vendoring as that was added back in June, and there's no other compose pieces that I can see. I did not commit that file.

Please let me know if I need to redo or adjust any of this.

[mheon]

Usually I just `git checkout v4.4.1-rhel; git checkout -b v4.4.1-crio` but I think your way is functionally equivalent. Code changes LGTM.

…

On Tue, Jan 2, 2024 at 8:32 PM Tom Sweeney ***@***.***> wrote: @mheon <https://github.com/mheon> and if you have time @vrothberg <https://github.com/vrothberg>, PTAL This is the first time that I've created a release-branch upstream from another one from upstream. Here are the git commands I used: git fetch --all git rebase upstream/main git checkout -b v4.4.1-crio git reset --hard b9594a7 git push upstream v4.4.1-crio b9594a7 <b9594a7> is the top-level commit in the v4.4.1-rhel branch. The above command created this PR: #21131 <#21131>, which I was not expecting and just created as a draft and summarily closed. For this PR, I then bumped c/storage to v1.46.1. The only odd thing is the `make vendor-in-container' command somehow dragged in the file docs/source/markdown/podman-compose.1.md, and I'm not sure how that was possibly pulled in during the vendoring as that was added back in June, and there's no other compose pieces that I can see. I did not commit that file. Please let me know if I need to redo or adjust any of this. — Reply to this email directly, view it on GitHub <#21132 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB3AOCAHNMVOFNOIU7CANWLYMSYKZAVCNFSM6AAAAABBKYDV3SVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZUG42TEMJSGY> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[mheon]

I'm going to go ahead and push the button.