Skip to content

Add support for more container engines#222

Merged
haesbaert merged 3 commits into
mainfrom
support_container_engines
Sep 12, 2025
Merged

Add support for more container engines#222
haesbaert merged 3 commits into
mainfrom
support_container_engines

Conversation

@stanek-michal
Copy link
Copy Markdown
Contributor

@stanek-michal stanek-michal commented Sep 5, 2025

With this change, quark k8s awareness works on non-docker runtimes.
Spotted when running quark on GKE which uses containerd like most modern k8s deployments. Confirmed working on GKE cluster.

Fixed a bug along the way:
terminated = GET(container_json, "terminated");
to
terminated = GET(state, "terminated");

@stanek-michal stanek-michal requested a review from a team as a code owner September 5, 2025 16:08
@cla-checker-service
Copy link
Copy Markdown

cla-checker-service Bot commented Sep 5, 2025

💚 CLA has been signed

@stanek-michal stanek-michal force-pushed the support_container_engines branch from 1e37f10 to 7401c5d Compare September 5, 2025 16:14
Copy link
Copy Markdown
Collaborator

@haesbaert haesbaert 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 testing it and adding those!
I think we can cut the case and the code would get much simpler, see the comments.

Comment thread quark.c Outdated
Comment thread quark.c
Comment thread quark.c Outdated
Comment thread quark.c Outdated
Comment thread quark.c Outdated
Comment thread quark-test.c Outdated
Comment thread quark.c
@haesbaert
Copy link
Copy Markdown
Collaborator

Heya so I've added the stuff we talked about, see if you're ok with it, also for some reason your CLA is acting up?

@stanek-michal stanek-michal force-pushed the support_container_engines branch from 32257d4 to e4d9932 Compare September 11, 2025 16:19
@stanek-michal
Copy link
Copy Markdown
Contributor Author

Heya so I've added the stuff we talked about, see if you're ok with it, also for some reason your CLA is acting up?

fixd

Copy link
Copy Markdown
Contributor Author

@stanek-michal stanek-michal left a comment

Choose a reason for hiding this comment

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

realized I can't approve a PR I started, we need volunteers

@haesbaert
Copy link
Copy Markdown
Collaborator

realized I can't approve a PR I started, we need volunteers

fear not, now I realized I can

@haesbaert haesbaert force-pushed the support_container_engines branch from e4d9932 to 06f6edd Compare September 12, 2025 07:03
@haesbaert haesbaert force-pushed the support_container_engines branch from 06f6edd to 2eb3fe9 Compare September 12, 2025 11:03
@haesbaert haesbaert force-pushed the support_container_engines branch from 2eb3fe9 to bd74d70 Compare September 12, 2025 12:33
Copy link
Copy Markdown
Contributor

@nicholasberlin nicholasberlin left a comment

Choose a reason for hiding this comment

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

Looks good, one question

Comment thread quark.c
With this change, quark k8s awareness works on non-docker runtimes.  Spotted
when running quark on GKE which uses containerd like most modern k8s
deployments.

We only support the systemd scheme, meaning foo-<id>.scope.

Co-authored-by: Christiano Haesbaert <haesbaert@elastic.co>
@haesbaert haesbaert force-pushed the support_container_engines branch from bd74d70 to 34ad9e3 Compare September 12, 2025 13:09
@haesbaert haesbaert merged commit 2c9e534 into main Sep 12, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants