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

Backport #2144 and #2167 to v1.0 branch #2292

Merged
merged 4 commits into from
Apr 8, 2024
Merged

Conversation

michi-covalent
Copy link
Contributor

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

Ref: #2144
Ref: #2167

@michi-covalent michi-covalent added the release-note/misc This PR makes changes that have no direct user impact. label Apr 4, 2024
@michi-covalent michi-covalent force-pushed the pr/michi/backport-2167 branch 3 times, most recently from b4440cd to 6efaf89 Compare April 4, 2024 02:00
@michi-covalent michi-covalent changed the title Backport https://github.com/cilium/tetragon/pull/2167 to v1.0 branch Backport #2144 and #2167 to v1.0 branch Apr 4, 2024
sfc-gh-gshe and others added 4 commits April 4, 2024 14:28
[ upstream commit 9af6da4 ]

Signed-off-by: Guozhen She <guozhen.she@snowflake.com>
Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
[ upstream commit 0acc05b ]

Instead of defining each informer as a separate field in K8sWatcher, define
informers map as well as AddInformers and GetInformer methods (to populate the
map and retrieve informers). This also required changing how the watcher is
started - K8sWatcher now contains startFunc function, which is extended in
AddInformers method and called in NewK8sWatcherWithTetragonClient.

This refactoring will make it easier to extend the watcher with additional
informers or to clean them up if needed.

Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
[ upstream commit efbbaa5 ]

They are unused. I also merged NewK8sWatcherWithTetragonClient function into
NewK8sWatcher and deleted unused code related to these informers.

Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
[ upstream commit da91e33 ]

Since Start() is now an exported method of K8sWatcher, it makes sense to
separate responsibilities of creating and starting the watcher.

Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent michi-covalent force-pushed the pr/michi/backport-2167 branch from 6efaf89 to 77299db Compare April 4, 2024 14:28
@willfindlay willfindlay marked this pull request as ready for review April 8, 2024 12:40
@willfindlay willfindlay requested a review from a team as a code owner April 8, 2024 12:40
@willfindlay willfindlay requested review from jrfastab and removed request for a team April 8, 2024 12:40
@willfindlay willfindlay merged commit 7324408 into v1.0 Apr 8, 2024
27 checks passed
@willfindlay willfindlay deleted the pr/michi/backport-2167 branch April 8, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants