Alexander Belanger 5 роки тому
батько
коміт
396bc41743

+ 2 - 2
internal/helm/grapher/object.go

@@ -12,7 +12,7 @@ type Object struct {
 
 // ParseObjs parses a k8s object from a single-document yaml
 // and returns an array of objects that includes its children.
-func ParseObjs(objs []map[string]interface{}) []Object {
+func ParseObjs(objs []map[string]interface{}, releaseNamespace string) []Object {
 	objArr := []Object{}
 
 	for i, obj := range objs {
@@ -27,7 +27,7 @@ func ParseObjs(objs []map[string]interface{}) []Object {
 		namespace := getField(obj, "metadata", "namespace")
 
 		if namespace == nil {
-			namespace = "default"
+			namespace = releaseNamespace
 		}
 
 		if name == nil {

+ 1 - 1
internal/helm/grapher/object_test.go

@@ -136,7 +136,7 @@ func TestParseObj(t *testing.T) {
 		}
 
 		yamlArr := grapher.ImportMultiDocYAML(file)
-		objects := grapher.ParseObjs(yamlArr)
+		objects := grapher.ParseObjs(yamlArr, "default")
 
 		for i, o := range objects {
 			if k8sObj.Expected[i].Kind != o.Kind {

+ 3 - 3
internal/helm/grapher/relation_test.go

@@ -139,7 +139,7 @@ func TestControlRels(t *testing.T) {
 		}
 
 		yamlArr := grapher.ImportMultiDocYAML(file)
-		objects := grapher.ParseObjs(yamlArr)
+		objects := grapher.ParseObjs(yamlArr, "default")
 		parsed := grapher.ParsedObjs{
 			Objects: objects,
 		}
@@ -192,7 +192,7 @@ func TestLabelRels(t *testing.T) {
 		}
 
 		yamlArr := grapher.ImportMultiDocYAML(file)
-		objects := grapher.ParseObjs(yamlArr)
+		objects := grapher.ParseObjs(yamlArr, "default")
 		parsed := grapher.ParsedObjs{
 			Objects: objects,
 		}
@@ -241,7 +241,7 @@ func TestSpecRels(t *testing.T) {
 		}
 
 		yamlArr := grapher.ImportMultiDocYAML(file)
-		objects := grapher.ParseObjs(yamlArr)
+		objects := grapher.ParseObjs(yamlArr, "default")
 		parsed := grapher.ParsedObjs{
 			Objects: objects,
 		}

+ 1 - 1
server/api/release_handler.go

@@ -240,7 +240,7 @@ func (app *App) HandleGetReleaseComponents(w http.ResponseWriter, r *http.Reques
 	}
 
 	yamlArr := grapher.ImportMultiDocYAML([]byte(release.Manifest))
-	objects := grapher.ParseObjs(yamlArr)
+	objects := grapher.ParseObjs(yamlArr, release.Namespace)
 
 	parsed := grapher.ParsedObjs{
 		Objects: objects,