add ephemeral containers to node profile

Signed-off-by: Matthias Bertschy <[email protected]>

Author: matthyx

.github/workflows/pr.yaml

@@ -15,17 +15,17 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21'
+        go-version: '1.22'
 
     - name: Test race
       run: go test -v -race ./...
-      
+
     - name: Test units
       run: go test -v ./... -covermode=count -coverprofile=coverage.out
 
     - name: Convert coverage to lcov
       uses: jandelgado/gcov2lcov-action@v1
-      
+
     - name: Coveralls
       uses: coverallsapp/github-action@v1
       with:
@@ -42,5 +42,3 @@ jobs:
         version: latest
         args: --timeout 10m --build-tags=static
         only-new-issues: true
-
-

.github/workflows/release.yaml

@@ -1,7 +1,7 @@
 name: Release-Tag
 on:
   push:
-    branches: [ main] 
+    branches: [ main]
     paths-ignore:
       # Do not run the pipeline if only Markdown files changed
       - '**.md'
@@ -14,14 +14,14 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21'
+        go-version: '1.22'
 
     - name: Build
       run: go build -v ./...
 
     - name: Test
       run: go test -v ./...
-    
+
     - name: Create a release
       id: create_release
       uses: actions/create-release@v1
@@ -31,4 +31,4 @@ jobs:
         tag_name: v0.0.${{ github.run_number }}
         release_name: Release v0.0.${{ github.run_number }}
         draft: false
-        prerelease: false
+        prerelease: false

armotypes/nodesProfile.go

@@ -96,7 +96,7 @@ func (nc *NodeStatus) CountRunningPodsContainers() int {
 	var containersCount int
 	runningPods := nc.GetRunningPods()
 	for _, pod := range runningPods {
-		containersCount += len(pod.Containers) + len(pod.InitContainers)
+		containersCount += len(pod.Containers) + len(pod.InitContainers) + len(pod.EphemeralContainers)
 	}
 	return containersCount
 }

armotypes/podstatus.go

@@ -1,6 +1,9 @@
 package armotypes
 
-import "time"
+import (
+	"slices"
+	"time"
+)
 
 type PodStatus struct {
 	CustomerGUID        string         `json:"customerGUID"`
@@ -22,6 +25,7 @@ type PodStatus struct {
 	CreationTimestamp   time.Time      `json:"creationTimestamp"`
 	Containers          []PodContainer `json:"containers,omitempty"`
 	InitContainers      []PodContainer `json:"initContainers,omitempty"`
+	EphemeralContainers []PodContainer `json:"ephemeralContainers,omitempty"`
 
 	HasFinalApplicationProfile bool `json:"hasFinalApplicationProfile"`
 
@@ -42,18 +46,11 @@ type PodContainer struct {
 func (ps *PodStatus) GetMonitoredContainers() []PodContainer {
 	var monitoredContainers []PodContainer
 	if ps.IsKDRMonitored {
-		for _, container := range ps.Containers {
+		for _, container := range slices.Concat(ps.Containers, ps.InitContainers, ps.EphemeralContainers) {
 			if container.IsKDRMonitored {
 				monitoredContainers = append(monitoredContainers, container)
 			}
 		}
-
-		for _, container := range ps.InitContainers {
-			if container.IsKDRMonitored {
-				monitoredContainers = append(monitoredContainers, container)
-			}
-		}
-
 	}
 	return monitoredContainers
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/armosec/armoapi-go
 
-go 1.21.1
+go 1.22.2
 
 require (
 	github.com/anchore/grype v0.74.2