Browse Source

fix get controllers (#4567)

Co-authored-by: Feroze Mohideen <feroze@porter.run>
Porter Support 2 years ago
parent
commit
f4b1e46c25

+ 1 - 1
api/server/handlers/release/get_all_pods.go

@@ -72,7 +72,7 @@ func GetPodsForRelease(ctx context.Context, helmRelease *release.Release, k8sAge
 	defer span.End()
 
 	yamlArr := grapher.ImportMultiDocYAML([]byte(helmRelease.Manifest))
-	controllers := grapher.ParseControllers(yamlArr)
+	controllers := grapher.ParseControllers(yamlArr, helmRelease.Namespace)
 	pods := make([]v1.Pod, 0)
 
 	telemetry.WithAttributes(span, telemetry.AttributeKV{Key: "num-controllers", Value: len(controllers)})

+ 1 - 1
api/server/handlers/release/get_controllers.go

@@ -46,7 +46,7 @@ func (c *GetControllersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	}
 
 	yamlArr := grapher.ImportMultiDocYAML([]byte(helmRelease.Manifest))
-	controllers := grapher.ParseControllers(yamlArr)
+	controllers := grapher.ParseControllers(yamlArr, helmRelease.Namespace)
 	retrievedControllers := []interface{}{}
 
 	// get current status of each controller

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

@@ -54,7 +54,7 @@ func ParseObjs(objs []map[string]interface{}, releaseNamespace string) []Object
 
 // ParseControllers parses a k8s object from a single-document yaml
 // and returns an array of controllers.
-func ParseControllers(objs []map[string]interface{}) []Object {
+func ParseControllers(objs []map[string]interface{}, releaseNamespace string) []Object {
 	objArr := []Object{}
 
 	for i, obj := range objs {
@@ -72,7 +72,7 @@ func ParseControllers(objs []map[string]interface{}) []Object {
 			namespace := getField(obj, "metadata", "namespace")
 
 			if namespace == nil {
-				namespace = "default"
+				namespace = releaseNamespace
 			}
 
 			if name == nil {