wip

Signed-off-by: Matthias Bertschy <[email protected]>
kubescape · Nov 20, 2024 · fd89bec · fd89bec
1 parent 4fb52bf
commit fd89bec
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/pkg/containerwatcher/v1/container_watcher_private.go b/pkg/containerwatcher/v1/container_watcher_private.go
@@ -10,7 +10,9 @@ import (
 	"time"
 
 	containercollection "github.com/inspektor-gadget/inspektor-gadget/pkg/container-collection"
+	containerutils "github.com/inspektor-gadget/inspektor-gadget/pkg/container-utils/types"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/socketenricher"
+	"github.com/inspektor-gadget/inspektor-gadget/pkg/types"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/utils/host"
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
@@ -36,7 +38,11 @@ func (ch *IGContainerWatcher) containerCallback(notif containercollection.PubSub
 
 	switch notif.Type {
 	case containercollection.EventTypeAddContainer:
-		logger.L().Info("start monitor on container", helpers.String("container ID", notif.Container.Runtime.ContainerID), helpers.String("k8s workload", k8sContainerID))
+		logger.L().Info("start monitor on container",
+			helpers.String("container ID", notif.Container.Runtime.ContainerID),
+			helpers.String("k8s workload", k8sContainerID),
+			helpers.String("ContainerImageDigest", notif.Container.Runtime.ContainerImageDigest),
+			helpers.String("ContainerImageName", notif.Container.Runtime.ContainerImageName))
 		if ch.running {
 			ch.timeBasedContainers.Add(notif.Container.Runtime.ContainerID)
 		} else {
@@ -108,7 +114,11 @@ func (ch *IGContainerWatcher) startContainerCollection(ctx context.Context) erro
 		containercollection.WithLinuxNamespaceEnrichment(),
 
 		// Get containers created with container runtimes
-		containercollection.WithContainerRuntimeEnrichment(ch.runtime),
+		containercollection.WithMultipleContainerRuntimesEnrichment(
+			[]*containerutils.RuntimeConfig{
+				{Name: types.RuntimeNameDocker},
+				{Name: types.RuntimeNameContainerd},
+			}),
 
 		// Get containers created with ebpf (works also if hostPid=false)
 		containercollection.WithContainerFanotifyEbpf(),