Build grpc ingestor image (#201)

* add local build for ingestor

* fix build ingestor image

* reduce binary arch supported

* removing goreleaser

* adding version tag for embed compose files

* removing version deprecated

* fix compose datadog

* PR comment

* Update pkg/backend/project.go

Co-authored-by: Edouard Schweisguth <edouard.schweisguth@datadoghq.com>

---------

Co-authored-by: Edouard Schweisguth <edouard.schweisguth@datadoghq.com>

Makefile

@@ -9,7 +9,7 @@ SYSTEM_TEST_CMD := system-test system-test-clean
 COMMIT := $(shell git rev-parse --short HEAD)
 DATE := $(shell git log -1 --format=%cd --date=format:"%Y%m%d")
 
-BUILD_VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
+BUILD_VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty --always --tags)
 BUILD_ARCH := $(shell go env GOARCH)
 BUILD_OS := $(shell go env GOOS)
 

cmd/kubehound/backend.go

@@ -9,9 +9,6 @@ var (
 	Backend     *docker.Backend
 	hard        bool
 	composePath []string
-
-	downTesting bool
-	uiTesting   bool
 )
 
 var (

cmd/kubehound/dev.go

@@ -12,9 +12,16 @@ var (
 	DefaultComposeTestingPath = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.testing.yaml"}
 	DefaultComposeDevPath     = []string{"./deployments/kubehound/docker-compose.yaml", "./deployments/kubehound/docker-compose.dev.yaml"}
 	DefaultComposeDevPathUI   = "./deployments/kubehound/docker-compose.ui.yaml"
+	DefaultComposeDevPathGRPC = "./deployments/kubehound/docker-compose.ingestor.yaml"
 	DefaultDatadogComposePath = "./deployments/kubehound/docker-compose.datadog.yaml"
 )
 
+var (
+	uiTesting   bool
+	grpcTesting bool
+	downTesting bool
+)
+
 var (
 	envCmd = &cobra.Command{
 		Use:    "dev",
@@ -28,6 +35,9 @@ var (
 			if uiTesting {
 				DefaultComposeDevPath = append(DefaultComposeDevPath, DefaultComposeDevPathUI)
 			}
+			if grpcTesting {
+				DefaultComposeDevPath = append(DefaultComposeDevPath, DefaultComposeDevPathGRPC)
+			}
 			// Adding datadog setup
 			_, ddAPIKeyOk := os.LookupEnv("DD_API_KEY")
 			_, ddAPPKeyOk := os.LookupEnv("DD_API_KEY")
@@ -65,6 +75,7 @@ func init() {
 	envCmd.AddCommand(envTestingCmd)
 	envCmd.PersistentFlags().BoolVar(&downTesting, "down", false, "Tearing down the kubehound dev stack and deleting the data associated with it")
 	envCmd.Flags().BoolVar(&uiTesting, "ui", false, "Include the UI in the dev stack")
+	envCmd.Flags().BoolVar(&grpcTesting, "grpc", false, "Include Grpc Server (ingestor) in the dev stack")
 
 	rootCmd.AddCommand(envCmd)
 }

deployments/kubehound/docker-compose.datadog.yaml

@@ -2,8 +2,6 @@ services:
   datadog:
     image: gcr.io/datadoghq/agent:7-jmx
     restart: unless-stopped
-    profiles: ["infra"]
-    container_name: ${COMPOSE_PROJECT_NAME}-datadog-agent
     ports:
       - "127.0.0.1:8225:8125/UDP"
       - "127.0.0.1:8226:8126"

deployments/kubehound/docker-compose.ingestor.yaml

@@ -0,0 +1,13 @@
+services:
+  grpc:
+    build:
+      context: ../../
+      dockerfile: deployments/kubehound/ingestor/Dockerfile
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:9000:9000"
+    networks:
+      - kubenet
+
+networks:
+  kubenet:

deployments/kubehound/docker-compose.release.yaml → deployments/kubehound/docker-compose.release.yaml.tpl

@@ -7,15 +7,15 @@ services:
       - mongodb_data:/data/db
 
   kubegraph:
-    image: ghcr.io/datadog/kubehound-graph:latest
+    image: ghcr.io/datadog/kubehound-graph:{{ .VersionTag }}
     ports:
       - "127.0.0.1:8182:8182"
       - "127.0.0.1:8099:8099"
     volumes:
       - kubegraph_data:/var/lib/janusgraph
 
   ui:
-    image: ghcr.io/datadog/kubehound-ui:latest
+    image: ghcr.io/datadog/kubehound-ui:{{ .VersionTag }}
     restart: unless-stopped
     ports:
       - "127.0.0.1:8888:8888"

deployments/kubehound/docker-compose.ui.yaml

@@ -1,9 +1,7 @@
-version: "3.8"
 services:
   notebook:
     build: ./notebook/
     restart: unless-stopped
-    container_name: ${COMPOSE_PROJECT_NAME}-notebook
     ports:
       - "127.0.0.1:8888:8888"
     networks:

deployments/kubehound/embed.go

@@ -5,4 +5,5 @@ import (
 )
 
 //go:embed *.yaml
+//go:embed *.yaml.tpl
 var F embed.FS

deployments/kubehound/ingestor/Dockerfile

@@ -15,7 +15,7 @@ FROM gcr.io/distroless/base-debian12 AS build-release-stage
 
 WORKDIR /
 
-COPY --from=build-stage /go/bin/kubehound /kubehound
+COPY --from=build-stage /go/bin/build/kubehound /kubehound
 
 EXPOSE 9000
 

docker-bake.hcl

@@ -52,12 +52,8 @@ target "binary-cross" {
     "darwin/amd64",
     "darwin/arm64",
     "linux/amd64",
-    "linux/arm/v6",
     "linux/arm/v7",
     "linux/arm64",
-    "linux/ppc64le",
-    "linux/riscv64",
-    "linux/s390x",
     "windows/amd64",
     "windows/arm64"
   ]

pkg/backend/project.go

@@ -1,12 +1,15 @@
 package backend
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"os"
 	"strings"
+	"text/template"
 
 	embedconfigdocker "github.com/DataDog/KubeHound/deployments/kubehound"
+	"github.com/DataDog/KubeHound/pkg/config"
 	"github.com/DataDog/KubeHound/pkg/telemetry/log"
 	"github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/loader"
@@ -16,7 +19,7 @@ import (
 )
 
 var (
-	DefaultReleaseComposePaths = []string{"docker-compose.yaml", "docker-compose.release.yaml"}
+	DefaultReleaseComposePaths = []string{"docker-compose.yaml", "docker-compose.release.yaml.tpl"}
 	DefaultDatadogComposePath  = "docker-compose.datadog.yaml"
 )
 
@@ -84,6 +87,7 @@ func loadEmbeddedConfig(ctx context.Context) (*types.Project, error) {
 	// Adding datadog setup
 	ddAPIKey, ddAPIKeyOk := os.LookupEnv("DD_API_KEY")
 	ddAPPKey, ddAPPKeyOk := os.LookupEnv("DD_API_KEY")
+
 	if ddAPIKeyOk && ddAPPKeyOk {
 		DefaultReleaseComposePaths = append(DefaultReleaseComposePaths, DefaultDatadogComposePath)
 		hostname, err = os.Hostname()
@@ -123,10 +127,33 @@ func loadEmbeddedConfig(ctx context.Context) (*types.Project, error) {
 
 func loadEmbeddedDockerCompose(_ context.Context, filepath string, dockerComposeFileData map[interface{}]interface{}) (map[interface{}]interface{}, error) {
 	var localYaml map[interface{}]interface{}
+	var localData []byte
+	var err error
 
-	localData, err := embedconfigdocker.F.ReadFile(filepath)
-	if err != nil {
-		return nil, fmt.Errorf("reading embed config: %w", err)
+	// Setting the version tag for the release dynamically
+	// For local version (when the version is "dirty", using latest to have a working binary)
+	version := map[string]string{"VersionTag": "latest"}
+	if !strings.HasSuffix(config.BuildVersion, "dirty") {
+		version["VersionTag"] = config.BuildVersion
+	}
+
+	if strings.HasSuffix(filepath, ".tpl") {
+		tmpl, err := template.New(filepath).ParseFS(embedconfigdocker.F, filepath)
+		if err != nil {
+			return nil, fmt.Errorf("new template: %w", err)
+		}
+
+		var buf bytes.Buffer
+		err = tmpl.Execute(&buf, version)
+		if err != nil {
+			return nil, fmt.Errorf("executing template: %w", err)
+		}
+		localData = buf.Bytes()
+	} else {
+		localData, err = embedconfigdocker.F.ReadFile(filepath)
+		if err != nil {
+			return nil, fmt.Errorf("reading embed config: %w", err)
+		}
 	}
 
 	err = yaml.Unmarshal(localData, &localYaml)