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

vendor: bump github.com/cilium/cilium to latest master #556

Merged
merged 1 commit into from
May 26, 2021
Merged

vendor: bump github.com/cilium/cilium to latest master #556

merged 1 commit into from
May 26, 2021

Conversation

tklauser
Copy link
Member

No description provided.

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label May 25, 2021
@tklauser tklauser requested a review from rolinh May 25, 2021 13:30
@rolinh
Copy link
Member

rolinh commented May 25, 2021

I'd suggest that we keep tracking cilium's master branch in hubble master (as we'll inevitably do this to support upcoming API additions) and track v1.10 in the v0.8 branch.

@tklauser
Copy link
Member Author

I'd suggest that we keep tracking cilium's master branch in hubble master (as we'll inevitably do this to support upcoming API additions) and track v1.10 in the v0.8 branch.

That's a good point. I'll repurpose this PR to update to latest cilium master (not sure whether it's worth it at this point, though?) and send a separate PR against v0.8 updating to cilium v1.10.0.

@rolinh
Copy link
Member

rolinh commented May 25, 2021

I'll repurpose this PR to update to latest cilium master (not sure whether it's worth it at this point, though?) and send a separate PR against v0.8 updating to cilium v1.10.0.

Probably other than it will make it clear that the master branch is tracking cilium master branch.

@tklauser tklauser changed the title vendor: bump github.com/cilium/cilium to v1.10.0 vendor: bump github.com/cilium/cilium to latest master May 25, 2021
rolinh
rolinh requested changes May 25, 2021
View reviewed changes
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that the go.universe.tf/metallb replace directive does not match the version in cilium master.

@tklauser
vendor: bump github.com/cilium/cilium to latest master
6e67b26 
Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser
Copy link
Member Author

I think that the go.universe.tf/metallb replace directive does not match the version in cilium master.

🤦 thanks for pointing this out

@tklauser tklauser requested a review from rolinh May 26, 2021 08:22
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 26, 2021
@rolinh rolinh merged commit bb314b6 into master May 26, 2021
@rolinh rolinh deleted the pr/tklauser/cilium-1.10.0 branch May 26, 2021 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rolinh rolinh rolinh approved these changes

Assignees
No one assigned
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tklauser @rolinh