e2e: remove function adding namespaces

edgelesssys · Apr 26, 2024 · 1a42162 · 1a42162
1 parent ffb9b52
commit 1a42162
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/e2e/internal/kuberesource/resourcegen/main.go b/e2e/internal/kuberesource/resourcegen/main.go
@@ -73,7 +73,7 @@ func main() {
 		kuberesource.PatchNamespaces(resources, *namespace)
 	}
 	if *addNamespaceObject {
-		resources = kuberesource.AddNamespaceObject(resources, *namespace)
+		resources = append(resources, kuberesource.Namespace(*namespace))
 	}
 
 	b, err := kuberesource.EncodeResources(resources...)

diff --git a/e2e/internal/kuberesource/sets.go b/e2e/internal/kuberesource/sets.go
@@ -635,11 +635,6 @@ func PatchNamespaces(resources []any, namespace string) []any {
 	return resources
 }
 
-// AddNamespaceObjects adds namespace objects to a set of resources.
-func AddNamespaceObjects(resources []any, namespace string) []any {
-	return append(resources, Namespace(namespace))
-}
-
 // Emojivoto returns resources for deploying Emojivoto application.
 func Emojivoto() ([]any, error) {
 	resources, err := generateEmojivoto(ServiceMeshDisabled)
@@ -651,11 +646,7 @@ func Emojivoto() ([]any, error) {
 	ns := ""
 	coordinator := Coordinator(ns).DeploymentApplyConfiguration
 	coordinatorService := ServiceForDeployment(coordinator)
-	coordinatorForwarder := PortForwarder("coordinator", ns).
-		WithListenPort(1313).
-		WithForwardTarget("coordinator", 1313).
-		PodApplyConfiguration
-	resources = append(resources, coordinator, coordinatorService, coordinatorForwarder)
+	resources = append(resources, coordinator, coordinatorService)
 
 	return resources, nil
 }