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.

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

[KNI] deps: bump kubernetes libs #143

Merged
merged 1 commit into from
Oct 23, 2023
Merged

[KNI] deps: bump kubernetes libs #143

merged 1 commit into from
Oct 23, 2023

Conversation

ffromani
Copy link
Member

bump kubernetes libraries to the last available

@openshift-ci openshift-ci bot requested review from jlojosnegros and MarSik October 23, 2023 15:35
@openshift-ci
Copy link

openshift-ci bot commented Oct 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani

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

@ffromani
Copy link
Member Author

/cherry-pick release-4.14

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2023
@openshift-cherrypick-robot

@ffromani: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

@ffromani ffromani changed the title [KNI] deps: vump kubernetes libs [KNI] deps: bump kubernetes libs Oct 23, 2023
bump kubernetes libraries to the last available

Signed-off-by: Francesco Romani <[email protected]>
@ffromani ffromani force-pushed the k8s-deps-bump-20231023 branch from d68532d to 72d709f Compare October 23, 2023 15:46
@ffromani ffromani merged commit 17de248 into master Oct 23, 2023
3 checks passed
@ffromani ffromani deleted the k8s-deps-bump-20231023 branch October 23, 2023 16:02
@openshift-cherrypick-robot

@ffromani: #143 failed to apply on top of branch "release-4.14":

Applying: deps: bump kubernetes libs
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
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 go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging 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 deps: bump kubernetes libs
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-4.14

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants