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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for dedicated Cilium Envoy DaemonSet #1546

Merged
merged 5 commits into from
May 24, 2023

Conversation

mhofstetter
Copy link
Member

@mhofstetter mhofstetter commented Apr 27, 2023

cilium/cilium#25081 adds support for deploying Cilium's L7 Proxy (Envoy) to be deployed in its own DaemonSet instead of running it in the same container as the Cilium Agent. Currently, it needs to be explicitly enabled via helm value envoy.enabled=true

This PR adds support for the new Envoy DaemonSet in the Cilium CLI.

  • Status
  • SysDump Log collection
  • SysDump DaemonSet & ConfigMap collection

Installation works out of the box with the newly introduced helm CLI mode 馃帀

Classic mode isn't supported for the time being and needs to be discussed.

@mhofstetter mhofstetter temporarily deployed to ci April 27, 2023 08:05 — with GitHub Actions Inactive
README.md Outdated Show resolved Hide resolved
@mhofstetter mhofstetter force-pushed the pr/mhofstetter/envoy-daemonset branch from 685ec7a to eb4f3e6 Compare April 27, 2023 08:55
@mhofstetter mhofstetter temporarily deployed to ci April 27, 2023 08:55 — with GitHub Actions Inactive
@mhofstetter mhofstetter added the dont-merge/blocked Another PR must be merged before this one. label May 1, 2023
@mhofstetter
Copy link
Member Author

mhofstetter commented May 1, 2023

setting dont-merge/blocked to wait for cilium/cilium#25081 being merged.

Of course status & sysdump still works even if Envoy isn't deployed as DaemonSet - it's for the sake of agreeing on resource naming etc.

@mhofstetter mhofstetter marked this pull request as ready for review May 1, 2023 06:58
@mhofstetter mhofstetter requested a review from a team as a code owner May 1, 2023 06:58
@squeed
Copy link
Contributor

squeed commented May 9, 2023

Seems reasonable! And I'm glad that you don't have to muck about with adding lots of new files to install mode :-)

@mhofstetter mhofstetter removed the dont-merge/blocked Another PR must be merged before this one. label May 10, 2023
@mhofstetter
Copy link
Member Author

removing label dont-merge/blocked because naming should be finalized in the cilium/cilium PR

@mhofstetter mhofstetter force-pushed the pr/mhofstetter/envoy-daemonset branch from eb4f3e6 to 1845199 Compare May 12, 2023 08:07
@mhofstetter mhofstetter temporarily deployed to ci May 12, 2023 08:07 — with GitHub Actions Inactive
@mhofstetter mhofstetter force-pushed the pr/mhofstetter/envoy-daemonset branch from 1845199 to c5d635d Compare May 12, 2023 08:15
@mhofstetter mhofstetter temporarily deployed to ci May 12, 2023 08:15 — with GitHub Actions Inactive
@mhofstetter
Copy link
Member Author

rebased to main to fix issues which changed checks (golangci-lint & helm upgrade)

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.

鉁旓笍

defaults/defaults.go Show resolved Hide resolved
@mhofstetter
Copy link
Member Author

@squeed would you mind taking a final look?

@mhofstetter mhofstetter temporarily deployed to ci May 23, 2023 11:28 — with GitHub Actions Inactive
This commit reflects the newly added cilium envoy daemonset in the
cilium cli status.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
With this commit, the SysDumpCollectors collects the logs from
the newly introduced Cilium Envoy Pods.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
With this commit, `cilium sysdump` collects the DaemonSet & ConfigMap of
the Cilium Envoy.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
To prevent irritation around the disabled "Envoy DaemonSet" in the
status - this commit replaces the default `disabled` with `disabled
(using embedded mode)` in case of the Envoy DaemonSet status.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
@mhofstetter mhofstetter force-pushed the pr/mhofstetter/envoy-daemonset branch from 4e74b7b to f1bea9f Compare May 23, 2023 11:42
@mhofstetter mhofstetter temporarily deployed to ci May 23, 2023 11:42 — with GitHub Actions Inactive
@mhofstetter
Copy link
Member Author

rebased to main to fix some CI issues

@mhofstetter
Copy link
Member Author

MLH sleeping? 馃 adding label ready-to-merge manually

@mhofstetter mhofstetter added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. area/servicemesh Service mesh labels May 23, 2023
@tklauser tklauser merged commit 1df3e70 into cilium:main May 24, 2023
19 checks passed
@mhofstetter mhofstetter deleted the pr/mhofstetter/envoy-daemonset branch May 24, 2023 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/servicemesh Service mesh ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants