chore(src): improve containerd support. #10
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Backport changes from falcosecurity/libs#2195. Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
FedeDP
force-pushed
the
chore/containerd_improve_support
branch
from
a471916 to
8c99b3f
Compare
FedeDP
commented
Jan 9, 2025
| @@ -163,7 +163,7 @@ load_plugins: [container] | |||
| By default, all engines are enabled on **default sockets**: | |||
| * Docker: `/var/run/docker.sock` | |||
| * Podman: `/run/podman/podman.sock` for root, + `/run/user/$uid/podman/podman.sock` for each user in the system | |||
| * Containerd: [`/run/containerd/containerd.sock`, `/run/k3s/containerd/containerd.sock`] | |||
| * Containerd: [`/run/containerd/containerd.sock`, `/run/k3s/containerd/containerd.sock`, `/run/host-containerd/containerd.sock`] | |||
There was a problem hiding this comment.
New bottlerocket related socket.
FedeDP
commented
Jan 9, 2025
| @@ -80,59 +82,61 @@ func (c *containerdEngine) ctrToInfo(namespacedContext context.Context, containe | |||
| } | |||
| } | |||
|
|
|||
| // Mounts related - TODO double check | |||
| // Mounts related | |||
FedeDP
commented
Jan 9, 2025
| RW: !readOnly, | ||
| Propagation: spec.Linux.RootfsPropagation, | ||
| }) | ||
| } | ||
|
|
||
| // Namespace related - FIXME | ||
| // Namespace related - see oci.WithHostNamespace() impl: it just removes the namespace from the list |
FedeDP
commented
Jan 9, 2025
Comment on lines
+137
to
+138
| imageDigest = image.Target().Digest.String() | ||
| if config.GetWithSize() { | ||
| size, _ = image.Size(context.TODO()) | ||
| imageSize = image.Target().Size |
FedeDP
commented
Jan 9, 2025
| @@ -166,18 +170,39 @@ func (c *containerdEngine) ctrToInfo(namespacedContext context.Context, containe | |||
| } | |||
| } | |||
|
|
|||
| // Check for privileged: | |||
| // see https://github.com/containerd/containerd/blob/main/pkg/oci/spec_opts.go#L1295 | |||
| privileged := true | |||
There was a problem hiding this comment.
Fixed; a bit ugly but couldn't find a better solution.
FedeDP
commented
Jan 9, 2025
| return event.Info{ | ||
| Container: event.Container{ | ||
| Type: typeContainerd.ToCTValue(), | ||
| ID: container.ID()[:shortIDLength], | ||
| Name: container.ID()[:shortIDLength], | ||
| ID: shortContainerID(container.ID()), |
There was a problem hiding this comment.
Since containerd supports container_id of any length, properly cut short ID to 12 only if it is longer than 12, to avoid crashes
FedeDP
commented
Jan 9, 2025
| ImageRepo: imageRepo, | ||
| ImageTag: imageTag, | ||
| User: spec.Process.User.Username, | ||
| CniJson: "", // TODO | ||
| User: strconv.FormatUint(uint64(spec.Process.User.UID), 10), |
FedeDP
commented
Jan 9, 2025
| // sha256:digest | ||
| // See https://github.com/therealbobo/libs/blob/8267fbb909167541c7f7ed655c93a7dc0c1d615b/userspace/libsinsp/cri.hpp#L320 | ||
| // for the original c++ implementation. | ||
| imageName := ctr.GetImage().GetImage() |
There was a problem hiding this comment.
Copied current libsinsp impl.
FedeDP
commented
Jan 9, 2025
| ImageRepo: imageRepo, | ||
| ImageTag: imageTag, | ||
| User: user.String(), | ||
| User: strconv.FormatInt(ctr.GetUser().GetLinux().GetUid(), 10), |
FedeDP
commented
Jan 9, 2025
| @@ -14,6 +15,191 @@ import ( | |||
| "time" | |||
| ) | |||
|
|
|||
| func TestCRIInfoMap(t *testing.T) { | |||
There was a problem hiding this comment.
Test that we are able to unmarshal the json to our struct.
Signed-off-by: Federico Di Pierro <[email protected]>
FedeDP
force-pushed
the
chore/containerd_improve_support
branch
from
8c99b3f to
b62bf68
Compare
…raction. Moreover, added tests around containerd matcher. Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
…support for docker and podman. Signed-off-by: Federico Di Pierro <[email protected]>
FedeDP
force-pushed
the
chore/containerd_improve_support
branch
from
76348e1 to
3a55b0f
Compare
Signed-off-by: Federico Di Pierro <[email protected]>
FedeDP
force-pushed
the
chore/containerd_improve_support
branch
from
3a55b0f to
603e03e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport changes from falcosecurity/libs#2195.
TODO:
/default/", ""layout; this only works for containers created in the default namespace; try to support containers created under any namespace? The go-worker containerd subscribe already retrieves info for any container in any namespace; it is a matter of fixing the matcher.Updated TODO with more info.