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

Move cilium/hubble code to cilium/cilium repo #31893

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Conversation

michi-covalent
Copy link
Contributor

@michi-covalent michi-covalent commented Apr 10, 2024

  • Copy hubble CLI code at cilium/hubble@10258183.
  • Include locally-built Hubble CLI in cilium-agent container image.
  • Add a GitHub workflow to build Hubble CLI release binaries and run
    integration tests.

See CFP-033 1 for details.

For reviewers:

Please review the following files carefully:

  • .github/workflows/hubble-cli.yaml
  • CODEOWNERS
  • go.mod
  • hubble/Makefile
  • images/cilium/Dockerfile

The following files don't have any logic changes except for fixing import paths and lint errors:

  • hubble/cmd/*
  • hubble/main.go
  • hubble/pkg/*

Footnotes

  1. https://github.com/cilium/design-cfps/pull/33

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Apr 10, 2024
@michi-covalent michi-covalent added the release-note/ci This PR makes changes to the CI. label Apr 10, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Apr 10, 2024
@michi-covalent
Copy link
Contributor Author

/test

@michi-covalent michi-covalent force-pushed the pr/michi/yes-hubble branch 4 times, most recently from 69f511d to 7676ddb Compare April 11, 2024 01:04
@michi-covalent
Copy link
Contributor Author

/test

@michi-covalent michi-covalent force-pushed the pr/michi/yes-hubble branch 2 times, most recently from 821bead to b91e823 Compare April 15, 2024 21:47
@michi-covalent michi-covalent changed the title hubble Move cilium/hubble code to cilium/cilium repo Apr 15, 2024
@michi-covalent
Copy link
Contributor Author

/test

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @michi-covalent 🙏

.github/workflows/hubble-cli.yaml Show resolved Hide resolved
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thank you! I have some concerns around the CI workflow, but not necessarily blocking

.github/workflows/hubble-cli.yaml Outdated Show resolved Hide resolved
.github/workflows/hubble-cli.yaml Show resolved Hide resolved
.github/workflows/hubble-cli.yaml Outdated Show resolved Hide resolved
CODEOWNERS Outdated Show resolved Hide resolved
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thank you!

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

🚢

@glibsm
Copy link
Member

glibsm commented Apr 19, 2024

so long years and years of git blame 😢

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Thanks @michi-covalent, maybe we should consider adding a /hubble/README.md file to clarify that the directory contains the Hubble CLI code (i.e. not the Hubble server part) to make it easier to discover for new contributors.

Copy link
Member

@aditighag aditighag left a comment

Choose a reason for hiding this comment

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

:rubber-stamp:

@joestringer joestringer removed the request for review from rolinh April 22, 2024 20:36
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Let's merge it ✔️

@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 Apr 22, 2024
@chancez chancez disabled auto-merge April 22, 2024 23:01
@chancez chancez enabled auto-merge April 22, 2024 23:01
@joestringer joestringer requested a review from a team April 23, 2024 01:11
- Copy hubble CLI code at cilium/hubble@10258183.
- Include locally-built Hubble CLI in cilium-agent container image.
- Add a GitHub workflow to build Hubble CLI release binaries and run
  integration tests.

See CFP-033 [^1] for details.

[^1]: cilium/design-cfps#33

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent
Copy link
Contributor Author

/test

@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 23, 2024
@chancez chancez added this pull request to the merge queue Apr 23, 2024
@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 Apr 23, 2024
Merged via the queue into main with commit 5aec7f5 Apr 23, 2024
278 checks passed
@chancez chancez deleted the pr/michi/yes-hubble branch April 23, 2024 14:44
@michi-covalent michi-covalent added the hubble-cli PRs or GitHub issues related with hubble-cli label May 3, 2024
michi-covalent added a commit to cilium/cilium-cli that referenced this pull request May 5, 2024
Hubble CLI code recently got moved into cilium/cilium repo [^1]. Import
github.com/cilium/cilium/hubble instead of github.com/cilium/hubble to
remove cilium/hubble dependency.

[^1]: cilium/cilium#31893

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
michi-covalent added a commit to cilium/cilium-cli that referenced this pull request May 7, 2024
Hubble CLI code recently got moved into cilium/cilium repo [^1]. Import
github.com/cilium/cilium/hubble instead of github.com/cilium/hubble to
remove cilium/hubble dependency.

[^1]: cilium/cilium#31893

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hubble-cli PRs or GitHub issues related with hubble-cli ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants