Merge branch 'main' into diagnose-collector

odigos-io · Jan 8, 2025 · 134f2a6 · 134f2a6
2 parents bb6c064 + 5700724
commit 134f2a6
Show file tree

Hide file tree

Showing 29 changed files with 594 additions and 152 deletions.
diff --git a/.github/workflows/trigger-odigos-enterprise.yaml b/.github/workflows/trigger-odigos-enterprise.yaml
@@ -6,9 +6,9 @@ on:
       - 'main'
     paths:
       - 'common/**'
-      - 'k8sUtils/**'
+      - 'k8sutils/**'
       - 'procdiscovery/**'
-      - 'opamserver/**'
+      - 'opampserver/**'
       - 'instrumentation/**'
 jobs:
   trigger-odigos-enterprise:

diff --git a/common/Makefile b/common/Makefile
@@ -1,4 +1,4 @@
 
-.PHONY: test
+.PHONY: test 
 test:
 	go test ./...
diff --git a/frontend/gqlgen.yml b/frontend/gqlgen.yml
@@ -48,9 +48,7 @@ models:
         resolver: true
       k8sActualNamespaces:
         resolver: true
-      k8sActualSource:
-        resolver: true
-      k8sActualSources:
+      sources:
         resolver: true
       destinations:
         resolver: true