diff --git a/test/e2e/helpers/parallel_test_helper.go b/test/e2e/helpers/parallel_test_helper.go index 895780b23f0..2ccd4d5769d 100644 --- a/test/e2e/helpers/parallel_test_helper.go +++ b/test/e2e/helpers/parallel_test_helper.go @@ -74,8 +74,11 @@ func ParallelTestHelper( for branchNumber, cse := range tc.branchesConfig { // construct filter services filterPodName := fmt.Sprintf("parallel-%s-branch-%d-filter", tc.name, branchNumber) - filterPod := resources.EventFilteringPod(filterPodName, cse.filter) - client.CreatePodOrFail(filterPod, testlib.WithService(filterPodName)) + if cse.filter { + recordevents.DeployEventRecordOrFail(ctx, client, filterPodName) + } else { + recordevents.DeployEventRecordOrFail(ctx, client, filterPodName, recordevents.EchoEvent) + } // construct branch subscriber subPodName := fmt.Sprintf("parallel-%s-branch-%d-sub", tc.name, branchNumber) @@ -187,8 +190,11 @@ func ParallelV1TestHelper( for branchNumber, cse := range tc.branchesConfig { // construct filter services filterPodName := fmt.Sprintf("parallel-%s-branch-%d-filter", tc.name, branchNumber) - filterPod := resources.EventFilteringPod(filterPodName, cse.filter) - client.CreatePodOrFail(filterPod, testlib.WithService(filterPodName)) + if cse.filter { + recordevents.DeployEventRecordOrFail(ctx, client, filterPodName) + } else { + recordevents.DeployEventRecordOrFail(ctx, client, filterPodName, recordevents.EchoEvent) + } // construct branch subscriber subPodName := fmt.Sprintf("parallel-%s-branch-%d-sub", tc.name, branchNumber) diff --git a/test/lib/resources/kube.go b/test/lib/resources/kube.go index c8ee0d2b0db..a0f68094d6c 100644 --- a/test/lib/resources/kube.go +++ b/test/lib/resources/kube.go @@ -27,7 +27,6 @@ import ( rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/apimachinery/pkg/util/uuid" pkgTest "knative.dev/pkg/test" ) @@ -66,29 +65,6 @@ func WithLabelsForPod(labels map[string]string) PodOption { } } -// EventFilteringPod creates a Pod that either filter or send the received CloudEvent -func EventFilteringPod(name string, filter bool) *corev1.Pod { - const imageName = "filterevents" - pod := &corev1.Pod{ - ObjectMeta: metav1.ObjectMeta{ - Name: name, - Labels: map[string]string{"e2etest": string(uuid.NewUUID())}, - }, - Spec: corev1.PodSpec{ - Containers: []corev1.Container{{ - Name: imageName, - Image: pkgTest.ImagePath(imageName), - ImagePullPolicy: corev1.PullIfNotPresent, - }}, - RestartPolicy: corev1.RestartPolicyAlways, - }, - } - if filter { - pod.Spec.Containers[0].Args = []string{"-filter"} - } - return pod -} - const ( PerfConsumerService = "perf-consumer" PerfAggregatorService = "perf-aggregator"