Force resource namespace to be appwrapper namespace (#70)

tardieu · web-flow · commit a155f48425d6 · 2023-12-01T20:33:02.000-05:00
diff --git a/internal/controller/resource_manager.go b/internal/controller/resource_manager.go
@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"fmt"
 	"strings"
 	"time"
 
@@ -93,8 +94,11 @@ func parseResource(appWrapper *mcadv1beta1.AppWrapper, raw []byte) (*unstructure
 		return nil, err
 	}
 	fixMap(appWrapper, obj.UnstructuredContent())
-	if obj.GetNamespace() == "" {
-		obj.SetNamespace("default")
+	namespace := obj.GetNamespace()
+	if namespace == "" {
+		obj.SetNamespace(appWrapper.Namespace)
+	} else if namespace != appWrapper.Namespace {
+		return nil, fmt.Errorf("generic item namespace \"%s\" is different from AppWrapper namespace \"%s\"", namespace, appWrapper.Namespace)
 	}
 	return obj, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package controller`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "fmt"`
`21`	`22`	`"strings"`
`22`	`23`	`"time"`
`23`	`24`
`@@ -93,8 +94,11 @@ func parseResource(appWrapper mcadv1beta1.AppWrapper, raw []byte) (unstructure`
`93`	`94`	`return nil, err`
`94`	`95`	`}`
`95`	`96`	`fixMap(appWrapper, obj.UnstructuredContent())`
`96`		`- if obj.GetNamespace() == "" {`
`97`		`- obj.SetNamespace("default")`
	`97`	`+ namespace := obj.GetNamespace()`
	`98`	`+ if namespace == "" {`
	`99`	`+ obj.SetNamespace(appWrapper.Namespace)`
	`100`	`+ } else if namespace != appWrapper.Namespace {`
	`101`	`+ return nil, fmt.Errorf("generic item namespace \"%s\" is different from AppWrapper namespace \"%s\"", namespace, appWrapper.Namespace)`
`98`	`102`	`}`
`99`	`103`	`return obj, nil`
`100`	`104`	`}`