Rename kubehound-ingestor to kubehound (#252)

* rename kubehound-ingestor to kubehound * fix paths in docker-compose files * fix path gitignore * re-adding jar lib * renaming ingestor to kubehound * cleaning datadog image
DataDog · Sep 6, 2024 · 6d730b8 · 6d730b8
1 parent ffb4dc9
commit 6d730b8
Show file tree

Hide file tree

Showing 35 changed files with 29 additions and 26 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -17,18 +17,18 @@ jobs:
   docker-build-push:
     runs-on: ubuntu-latest
     strategy:
-        # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
-        matrix:
-          include:
-            - dockerfile: deployments/kubehound/kubegraph/Dockerfile
-              image: graph
-              workdir: deployments/kubehound/kubegraph/
-            - dockerfile: deployments/kubehound/notebook/Dockerfile
-              image: ui
-              workdir: deployments/kubehound/notebook/
-            - dockerfile: deployments/kubehound/ingestor/Dockerfile
-              image: ingestor
-              workdir: .
+      # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
+      matrix:
+        include:
+          - dockerfile: deployments/kubehound/graph/Dockerfile
+            image: graph
+            workdir: deployments/kubehound/graph/
+          - dockerfile: deployments/kubehound/ui/Dockerfile
+            image: ui
+            workdir: deployments/kubehound/ui/
+          - dockerfile: deployments/kubehound/kubehound/Dockerfile
+            image: kubehound
+            workdir: .
     permissions:
       contents: read
       packages: write
@@ -97,8 +97,8 @@ jobs:
           build-args: |
             VERSION=${{ github.ref_name }}
           tags: |
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:${{ github.ref_name }}
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:${{ github.ref_name }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:latest
 
       - name: Build and push Docker image
         if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -111,5 +111,5 @@ jobs:
           build-args: |
             VERSION=${{ github.sha }}
           tags: |
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:snapshot-${{ github.sha }}
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:snapshot-${{ github.sha }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image }}:latest
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ bin/
 *.dll
 *.so
 *.dylib
-*.jar
 *.class
 *.lst
 
@@ -53,7 +52,7 @@ test/system/generator/generator
 scripts/collectors/
 
 # java
-deployments/kubehound/kubegraph/dsl/kubehound/target
+deployments/kubehound/graph/dsl/kubehound/target
 
 # personal settings
 .vscode/settings.json
@@ -100,4 +99,4 @@ override.tf.json
 
 # Ignore CLI configuration files
 .terraformrc
-terraform.rc
+terraform.rc
diff --git a/deployments/kubehound/docker-compose.dev.datadog.yaml b/deployments/kubehound/docker-compose.dev.datadog.yaml
@@ -1,6 +1,5 @@
 services:
   datadog:
-    image: gcr.io/datadoghq/agent:7-jmx
     build:
       context: datadog
       dockerfile: Dockerfile

diff --git a/deployments/kubehound/docker-compose.dev.graph.yaml b/deployments/kubehound/docker-compose.dev.graph.yaml
@@ -1,7 +1,7 @@
 name: kubehound-dev
 services:
   kubegraph:
-    build: ./kubegraph/
+    build: ./graph/
     ports:
       - "127.0.0.1:8182:8182"
       - "127.0.0.1:8099:8099"
diff --git a/deployments/kubehound/docker-compose.dev.ingestor.yaml b/deployments/kubehound/docker-compose.dev.ingestor.yaml
@@ -3,7 +3,7 @@ services:
   grpc:
     build:
       context: ../../
-      dockerfile: deployments/kubehound/ingestor/Dockerfile
+      dockerfile: deployments/kubehound/kubehound/Dockerfile
     restart: unless-stopped
     ports:
       - "127.0.0.1:9000:9000"

diff --git a/deployments/kubehound/docker-compose.release.datadog.yaml b/deployments/kubehound/docker-compose.release.datadog.yaml
@@ -1,9 +1,6 @@
 services:
   datadog:
     image: gcr.io/datadoghq/agent:7-jmx
-    build:
-      context: datadog
-      dockerfile: Dockerfile
     restart: unless-stopped
     ports:
       - "127.0.0.1:8225:8125/UDP"

diff --git a/deployments/kubehound/docker-compose.testing.yaml b/deployments/kubehound/docker-compose.testing.yaml
@@ -5,7 +5,7 @@ services:
       - "127.0.0.1:27018:27017"
 
   kubegraph:
-    build: ./kubegraph/
+    build: ./graph/
     ports:
       - "127.0.0.1:8183:8182"
       - "127.0.0.1:8090:8099"
diff --git a/deployments/kubehound/kubegraph/Dockerfile → deployments/kubehound/graph/Dockerfile b/deployments/kubehound/kubegraph/Dockerfile → deployments/kubehound/graph/Dockerfile
diff --git a/...ents/kubehound/kubegraph/conf/jvm.options → deployments/kubehound/graph/conf/jvm.options b/...ents/kubehound/kubegraph/conf/jvm.options → deployments/kubehound/graph/conf/jvm.options
diff --git a/...behound/kubegraph/dsl/kubehound/README.md → ...s/kubehound/graph/dsl/kubehound/README.md b/...behound/kubegraph/dsl/kubehound/README.md → ...s/kubehound/graph/dsl/kubehound/README.md
diff --git a/...kubehound/kubegraph/dsl/kubehound/pom.xml → ...nts/kubehound/graph/dsl/kubehound/pom.xml b/...kubehound/kubegraph/dsl/kubehound/pom.xml → ...nts/kubehound/graph/dsl/kubehound/pom.xml
diff --git a/...tadog/ase/kubehound/EndpointExposure.java → ...tadog/ase/kubehound/EndpointExposure.java b/...tadog/ase/kubehound/EndpointExposure.java → ...tadog/ase/kubehound/EndpointExposure.java
diff --git a/.../ase/kubehound/KubeHoundTraversalDsl.java → .../ase/kubehound/KubeHoundTraversalDsl.java b/.../ase/kubehound/KubeHoundTraversalDsl.java → .../ase/kubehound/KubeHoundTraversalDsl.java
diff --git a/...ubehound/KubeHoundTraversalSourceDsl.java → ...ubehound/KubeHoundTraversalSourceDsl.java b/...ubehound/KubeHoundTraversalSourceDsl.java → ...ubehound/KubeHoundTraversalSourceDsl.java
diff --git a/...tadog/ase/kubehound/KubeHoundDslTest.java → ...tadog/ase/kubehound/KubeHoundDslTest.java b/...tadog/ase/kubehound/KubeHoundDslTest.java → ...tadog/ase/kubehound/KubeHoundDslTest.java
diff --git a/...ehound/kubegraph/kubehound-db-init.groovy → .../kubehound/graph/kubehound-db-init.groovy b/...ehound/kubegraph/kubehound-db-init.groovy → .../kubehound/graph/kubehound-db-init.groovy
diff --git a/...ehound/kubegraph/lib/exporter-config.yaml → .../kubehound/graph/lib/exporter-config.yaml b/...ehound/kubegraph/lib/exporter-config.yaml → .../kubehound/graph/lib/exporter-config.yaml
diff --git a/...h/lib/jmx_prometheus_javaagent-0.18.0.jar → ...h/lib/jmx_prometheus_javaagent-0.18.0.jar b/...h/lib/jmx_prometheus_javaagent-0.18.0.jar → ...h/lib/jmx_prometheus_javaagent-0.18.0.jar
diff --git a/...und/kubegraph/scripts/health-check.groovy → ...behound/graph/scripts/health-check.groovy b/...und/kubegraph/scripts/health-check.groovy → ...behound/graph/scripts/health-check.groovy
diff --git a/...begraph/scripts/kubehound-dsl-init.groovy → ...d/graph/scripts/kubehound-dsl-init.groovy b/...begraph/scripts/kubehound-dsl-init.groovy → ...d/graph/scripts/kubehound-dsl-init.groovy
diff --git a/deployments/kubehound/ingestor/Dockerfile → deployments/kubehound/kubehound/Dockerfile b/deployments/kubehound/ingestor/Dockerfile → deployments/kubehound/kubehound/Dockerfile
diff --git a/...oyments/kubehound/notebook/BlueTeam.ipynb → deployments/kubehound/ui/BlueTeam.ipynb b/...oyments/kubehound/notebook/BlueTeam.ipynb → deployments/kubehound/ui/BlueTeam.ipynb
diff --git a/deployments/kubehound/notebook/Dockerfile → deployments/kubehound/ui/Dockerfile b/deployments/kubehound/notebook/Dockerfile → deployments/kubehound/ui/Dockerfile
diff --git a/...nts/kubehound/notebook/InitialSetup.ipynb → deployments/kubehound/ui/InitialSetup.ipynb b/...nts/kubehound/notebook/InitialSetup.ipynb → deployments/kubehound/ui/InitialSetup.ipynb
diff --git a/...kubehound/notebook/KindCluster_Demo.ipynb → ...ments/kubehound/ui/KindCluster_Demo.ipynb b/...kubehound/notebook/KindCluster_Demo.ipynb → ...ments/kubehound/ui/KindCluster_Demo.ipynb
diff --git a/...yments/kubehound/notebook/KubeHound.ipynb → deployments/kubehound/ui/KubeHound.ipynb b/...yments/kubehound/notebook/KubeHound.ipynb → deployments/kubehound/ui/KubeHound.ipynb
diff --git a/...kubehound/notebook/KubehoundDSL_101.ipynb → ...ments/kubehound/ui/KubehoundDSL_101.ipynb b/...kubehound/notebook/KubehoundDSL_101.ipynb → ...ments/kubehound/ui/KubehoundDSL_101.ipynb
diff --git a/...ook/LowHangingFruit-ContainerEscape.ipynb → .../ui/LowHangingFruit-ContainerEscape.ipynb b/...ook/LowHangingFruit-ContainerEscape.ipynb → .../ui/LowHangingFruit-ContainerEscape.ipynb
diff --git a/.../notebook/LowHangingFruit-Endpoints.ipynb → ...ehound/ui/LowHangingFruit-Endpoints.ipynb b/.../notebook/LowHangingFruit-Endpoints.ipynb → ...ehound/ui/LowHangingFruit-Endpoints.ipynb
diff --git a/deployments/kubehound/notebook/RedTeam.ipynb → deployments/kubehound/ui/RedTeam.ipynb b/deployments/kubehound/notebook/RedTeam.ipynb → deployments/kubehound/ui/RedTeam.ipynb
diff --git a/.../kubehound/notebook/SecurityPosture.ipynb → ...yments/kubehound/ui/SecurityPosture.ipynb b/.../kubehound/notebook/SecurityPosture.ipynb → ...yments/kubehound/ui/SecurityPosture.ipynb
diff --git a/deployments/kubehound/ui/build_notebooks.sh b/deployments/kubehound/ui/build_notebooks.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+source /tmp/venv/bin/activate
+
+init_setup_path="${find . -iname "initial_setup.ipynb}"
+
+for i in $(find . -iname "*.ipynb" -maxdepth 1); do nbmerge $init_setup_path "$i";done
diff --git a/deployments/kubehound/notebook/notebook.json → deployments/kubehound/ui/notebook.json b/deployments/kubehound/notebook/notebook.json → deployments/kubehound/ui/notebook.json
diff --git a/deployments/kubehound/notebook/service.sh → deployments/kubehound/ui/service.sh b/deployments/kubehound/notebook/service.sh → deployments/kubehound/ui/service.sh
diff --git a/...ts/kubehound/notebook/shared/shared.ipynb → deployments/kubehound/ui/shared/shared.ipynb b/...ts/kubehound/notebook/shared/shared.ipynb → deployments/kubehound/ui/shared/shared.ipynb