From d0c59d84738bbbcb5c6e9864dccd32bce727bd9c Mon Sep 17 00:00:00 2001
From: Mario Macias <mmaciasl@redhat.com>
Date: Tue, 21 Jun 2022 12:29:11 +0200
Subject: [PATCH] Fix FLP in e2e tests (#35)
* Fix FLP in e2e tests
* increasing resource limits for kafka e2e tests
---
e2e/cluster/base/03-flp.yml | 7 +------
e2e/kafka/kafka_test.go | 2 +-
e2e/kafka/manifests/11-kafka-cluster.yml | 7 +++++++
e2e/kafka/manifests/20-flp-transformer.yml | 9 +++------
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/e2e/cluster/base/03-flp.yml b/e2e/cluster/base/03-flp.yml
index bf5476db..24acccc7 100644
--- a/e2e/cluster/base/03-flp.yml
+++ b/e2e/cluster/base/03-flp.yml
@@ -39,10 +39,8 @@ data:
log-level: debug
pipeline:
- name: ingest
- - name: decode
- follows: ingest
- name: enrich
- follows: decode
+ follows: ingest
- name: loki
follows: enrich
parameters:
@@ -51,9 +49,6 @@ data:
type: grpc
grpc:
port: 9999
- - name: decode
- decode:
- type: protobuf
- name: enrich
transform:
type: network
diff --git a/e2e/kafka/kafka_test.go b/e2e/kafka/kafka_test.go
index a53949f1..ae919472 100644
--- a/e2e/kafka/kafka_test.go
+++ b/e2e/kafka/kafka_test.go
@@ -23,7 +23,7 @@ import (
const (
clusterNamePrefix = "kafka-test-cluster"
- testTimeout = 10 * time.Minute
+ testTimeout = 20 * time.Minute
namespace = "default"
)
diff --git a/e2e/kafka/manifests/11-kafka-cluster.yml b/e2e/kafka/manifests/11-kafka-cluster.yml
index 2dcc2678..2654748e 100644
--- a/e2e/kafka/manifests/11-kafka-cluster.yml
+++ b/e2e/kafka/manifests/11-kafka-cluster.yml
@@ -28,6 +28,13 @@ spec:
inter.broker.protocol.version: "3.1"
storage:
type: ephemeral
+ resources:
+ limits:
+ cpu: 1000m
+ memory: 1024Mi
+ requests:
+ cpu: 250m
+ memory: 256Mi
zookeeper:
replicas: 1
storage:
diff --git a/e2e/kafka/manifests/20-flp-transformer.yml b/e2e/kafka/manifests/20-flp-transformer.yml
index 090858d3..af76dba2 100644
--- a/e2e/kafka/manifests/20-flp-transformer.yml
+++ b/e2e/kafka/manifests/20-flp-transformer.yml
@@ -36,10 +36,8 @@ data:
log-level: debug
pipeline:
- name: ingest
- - name: decode
- follows: ingest
- name: enrich
- follows: decode
+ follows: ingest
- name: loki
follows: enrich
parameters:
@@ -50,9 +48,8 @@ data:
brokers: ["kafka-cluster-kafka-bootstrap"]
topic: network-flows
groupId: kafka-transformer
- - name: decode
- decode:
- type: json
+ decoder:
+ type: json
- name: enrich
transform:
type: network
--
GitLab