Merge pull request #342 from flanksource/feat/link-kubernetes-resourc…

…es-to-namespace feat: link kubernetes resources to their namespace
flanksource · Dec 31, 2023 · 52306bf · 52306bf
2 parents 7a62640 + afd5412
commit 52306bf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/scrapers/kubernetes/kubernetes.go b/scrapers/kubernetes/kubernetes.go
@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -109,6 +110,20 @@ func (kubernetes KubernetesScraper) Scrape(ctx api.ScrapeContext) v1.ScrapeResul
 				}
 			}
 
+			if obj.GetNamespace() != "" {
+				relationships = append(relationships, v1.RelationshipResult{
+					ConfigExternalID: v1.ExternalID{
+						ExternalID: []string{string(obj.GetUID())},
+						ConfigType: ConfigTypePrefix + obj.GetKind(),
+					},
+					RelatedExternalID: v1.ExternalID{
+						ExternalID: []string{fmt.Sprintf("Kubernetes/Namespace//%s", obj.GetNamespace())},
+						ConfigType: ConfigTypePrefix + "Namespace",
+					},
+					Relationship: "Namespace" + obj.GetKind(),
+				})
+			}
+
 			for _, ownerRef := range obj.GetOwnerReferences() {
 				rel := v1.RelationshipResult{
 					ConfigExternalID: v1.ExternalID{

diff --git a/scrapers/runscrapers_test.go b/scrapers/runscrapers_test.go
@@ -88,7 +88,7 @@ var _ = Describe("Scrapers test", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred(), "failed to create Secret")
 		})
 
-		It("should save second configMap", func() {
+		It("should save a second configMap", func() {
 			cm2 := &apiv1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "second-config",
@@ -124,7 +124,10 @@ var _ = Describe("Scrapers test", Ordered, func() {
 			err = gormDB.Find(&configRelationships).Error
 			Expect(err).To(BeNil())
 
-			Expect(len(configRelationships)).To(Equal(2))
+			// 2 relationships are coming from the relationship config above &
+			// the remaining 21 are coming from the relationship with the namespace.
+			// eg. Namespace->ConfigMap,Namespace->Endpoints, Namespace->RoleBinding,  Namespace->Role ...
+			Expect(len(configRelationships)).To(Equal(2 + 21))
 		})
 	})