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

[1.24] bump ocicni to 0.4.0 #5960

Merged
merged 1 commit into from Jun 14, 2022
Merged

[1.24] bump ocicni to 0.4.0 #5960

merged 1 commit into from Jun 14, 2022

Conversation

haircommander
Copy link
Member

Signed-off-by: Peter Hunt pehunt@redhat.com

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix a panic caused by using the improper Result structure version when setting up CNI plugins

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 9, 2022
@openshift-ci openshift-ci bot requested review from klihub and wgahnagl June 9, 2022 16:54
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2022
@haircommander
bump ocicni to 0.4.0
2cf9cf9 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander
Copy link
Member Author

/retest

1 similar comment
@haircommander
Copy link
Member Author

/retest

saschagrunert
saschagrunert approved these changes Jun 14, 2022
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert 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 Jun 14, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [haircommander,saschagrunert]

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

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

12 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci openshift-ci bot merged commit ff26732 into cri-o:release-1.24 Jun 14, 2022
@haircommander haircommander mentioned this pull request Jul 15, 2022
Closed
@haircommander
Copy link
Member Author

/cherry-pick release-1.23

@openshift-cherrypick-robot
Copy link

@haircommander: #5960 failed to apply on top of branch "release-1.23":

Applying: bump ocicni to 0.4.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/cri-o/ocicni/pkg/ocicni/util_linux.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/cri-o/ocicni/pkg/ocicni/util_linux.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump ocicni to 0.4.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.23

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/test-infra repository.

@openshift-ci openshift-ci bot mentioned this pull request Sep 28, 2022
Merged
juanfresia pushed a commit to juanfresia/cri-o that referenced this pull request Oct 17, 2022
@openshift-ci @juanfresia
Cherry-pick ff26732 (from pull request cri-o#5960) into release-1.23
76894be 
[1.23] bump ocicni to 0.4.0
@juanfresia juanfresia mentioned this pull request Oct 17, 2022
Merged
juanfresia pushed a commit to juanfresia/cri-o that referenced this pull request Oct 17, 2022
@openshift-ci @juanfresia
Cherry-pick ff26732 (from pull request cri-o#5960) into release-1.23
f2d928a 
[1.23] bump ocicni to 0.4.0

Signed-off-by: Juan Manuel Fresia <jfresia@medallia.com>
openshift-merge-robot added a commit that referenced this pull request Oct 18, 2022
@openshift-merge-robot
Merge pull request #6320 from juanfresia/bump-ocicni-1.23
eff00be 
Cherry-pick ff26732 (from pull request #5960) into release-1.23
This was referenced Oct 22, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

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

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

@klihub klihub Awaiting requested review from klihub

@wgahnagl wgahnagl Awaiting requested review from wgahnagl

Assignees

@saschagrunert saschagrunert

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. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@haircommander @openshift-bot @openshift-cherrypick-robot @saschagrunert