From 1a42162d8671c57af73e526643701ad02a35f4c9 Mon Sep 17 00:00:00 2001 From: Martin Irungu <68087402+wirungu@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:48:41 +0200 Subject: [PATCH] e2e: remove function adding namespaces --- e2e/internal/kuberesource/resourcegen/main.go | 2 +- e2e/internal/kuberesource/sets.go | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/e2e/internal/kuberesource/resourcegen/main.go b/e2e/internal/kuberesource/resourcegen/main.go index f89a9dd87..f6e0b8e79 100644 --- 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 index d0972ab45..0a98a9c21 100644 --- 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 }