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

Fix dependabot merge conflict #55

Closed
wants to merge 2 commits into from
Closed

Fix dependabot merge conflict #55

wants to merge 2 commits into from

Conversation

varad-ahirwadkar
Copy link
Contributor

This PR fixes the merge conflict of Bump sigs.k8s.io/controller-runtime from 0.18.4 to 0.19.0](#41)

dependabot bot and others added 2 commits October 23, 2024 16:57
@dependabot @varad-ahirwadkar
Bump sigs.k8s.io/controller-runtime from 0.18.4 to 0.19.0
550d729 
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.4 to 0.19.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.4...v0.19.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@varad-ahirwadkar
Fix merge conflict
eada877
@ppc64le-cloud-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: varad-ahirwadkar
Once this PR has been reviewed and has the lgtm label, please assign mkumatag for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@mkumatag
Copy link
Member

my original question here was what else we need update with k8s dependencies in mod/code because we will be bumping to a newer version, I kicked in the rebase and seems like it create a new PR for that here - #56, if this is enough then we can merge that itself.

@varad-ahirwadkar
Copy link
Contributor Author

Hi @mkumatag, yes these changes are sufficient for new controller-runtime

@mkumatag
Copy link
Member

Hi @mkumatag, yes these changes are sufficient for new controller-runtime

thanks.

@mkumatag mkumatag closed this Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkumatag mkumatag Awaiting requested review from mkumatag

Assignees
No one assigned
Labels
size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@varad-ahirwadkar @ppc64le-cloud-bot @mkumatag