diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml index ff81feaac61c24e68613304aa5e9ee2a694498e0..a98cca9b17c0052ebcd7b97c4e2ec4265131ebfb 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml @@ -26,6 +26,16 @@ spec: container: "zookeeper-client" command: ["bash", "-c", "bin/zkCli.sh -server $ZOOKEEPER_SERVER deleteall /app-theodolite-uc1-application-1"] timeoutSeconds: 60 + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*samza.*" + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*uc1-application.*" loadGenerator: resources: - configMap: @@ -81,10 +91,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: ".*samza.*" - removeOnly: true - - name: ".*uc1-application.*" - removeOnly: true \ No newline at end of file diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml index a55b9df05db3323e3561c4457d72bfaab02463b1..1b8597a92c02631106221f37d6b132a662a3a7c2 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml @@ -105,8 +105,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml index 6e92cb3f1a71e0109e81b5632815f61e9819b955..baf2775d02743d184e889460ca39c7920c1d0277 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml @@ -27,6 +27,16 @@ spec: container: "zookeeper-client" command: ["bash", "-c", "bin/zkCli.sh -server $ZOOKEEPER_SERVER deleteall /app-theodolite-uc2-application-1"] timeoutSeconds: 60 + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*samza.*" + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*uc2-application.*" loadGenerator: resources: - configMap: @@ -82,10 +92,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: ".*samza.*" - removeOnly: true - - name: ".*uc2-application.*" - removeOnly: true \ No newline at end of file diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml index e3b27eb55b8adc977f71fb9815b3fbe2283d9e27..85792aa12ac56ecea5c9ab92e8f8c11baae0e0e0 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml @@ -105,8 +105,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml index 3f2412d8a1036d0e0b8497e8d5093584a40c8d8b..bae58e3d0195f1eff408efa42d249a209a50d506 100644 --- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml @@ -80,8 +80,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml index 73f4297cd49445f5c1ac7f84baef59b06a184e3d..c34cd7e548969936207e3082ca00aa31f285fad9 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml @@ -18,6 +18,12 @@ spec: - "uc2-kstreams-service.yaml" - "uc2-jmx-configmap.yaml" - "uc2-service-monitor.yaml" + afterActions: + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: "^theodolite-.*" loadGenerator: resources: - configMap: @@ -85,14 +91,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - # - name: "input" - # numPartitions: 100 - # replicationFactor: 1 - # - name: "output" - # numPartitions: 100 - # replicationFactor: 1 - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml index 64a286d1ba9500f83a4b79e735aba6efc4cfa997..6e712e7d342d69032e9b7da195fc8dab79030b7b 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml @@ -100,8 +100,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml index e800b5d193ddbc76dd5a4fbc384fffa9a7001d83..2d20968068228099fe0e7c49f3f872f470d762a1 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml @@ -27,6 +27,16 @@ spec: container: "zookeeper-client" command: ["bash", "-c", "bin/zkCli.sh -server $ZOOKEEPER_SERVER deleteall /app-theodolite-uc3-application-1"] timeoutSeconds: 60 + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*samza.*" + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*uc3-application.*" loadGenerator: resources: - configMap: @@ -89,10 +99,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: ".*samza.*" - removeOnly: true - - name: ".*uc3-application.*" - removeOnly: true \ No newline at end of file diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml index d5717734f87c6ad8438e91a938260df5866a03ce..a7139477f2b55050fea6dc11808de65d10fb2906 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml @@ -100,8 +100,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml index 62086b68a9f2af6b26442b45ddbde39dd348e3be..cf9c5b565a5b711d3e54df3cbc577f378d331940 100644 --- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml @@ -75,8 +75,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml index 6917380a229dbb1ee8b69dcd227babb9ad7db2c7..91a34ace51a4352a905c330236283615b48e045f 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml @@ -18,6 +18,12 @@ spec: - "uc3-kstreams-service.yaml" - "uc3-jmx-configmap.yaml" - "uc3-service-monitor.yaml" + afterActions: + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: "^theodolite-.*" loadGenerator: resources: - configMap: @@ -80,8 +86,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml index b7f9314578f4d9d280a6d157a0f422a24fdfa1d3..e9f7538d88b1919e1bde20c659c0d8e26db1df1c 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml @@ -108,8 +108,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml index ceae2c32682447accb948e73f87e5c513438be7d..32ed3e0af7ab7a8b4325fb32a3f524b3c7b00553 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml @@ -29,6 +29,21 @@ spec: container: "zookeeper-client" command: ["bash", "-c", "bin/zkCli.sh -server $ZOOKEEPER_SERVER deleteall /app-theodolite-uc4-application-1"] timeoutSeconds: 60 + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: "^theodolite-.*" + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*samza.*" + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: ".*uc4-application.*" loadGenerator: resources: - configMap: @@ -85,12 +100,3 @@ spec: threshold: 2000 externalSloUrl: "http://localhost:80/evaluate-slope" warmup: 60 # in seconds - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True - - name: ".*samza.*" - removeOnly: true - - name: ".*uc4-application.*" - removeOnly: true \ No newline at end of file diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml index 02bf7a3b83ee69403781ffc5a37a34bff1ffb76d..bcc91be7389c3932774cdcfba2387a480cc519ce 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml @@ -108,8 +108,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml index 7b0d4bfc262b2db852005fbd8b7ae5e9e7bd255e..1efb8de028dc3ad24bd51ea8eca1570f1ed94dd6 100644 --- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml @@ -83,8 +83,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml index 99dadc3e512c190ce512d1d53aa8a78d691e4196..ec466c077a069a6b8b542cc668126bd57bb7b0da 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml @@ -20,6 +20,12 @@ spec: - "uc4-kstreams-service.yaml" - "uc4-jmx-configmap.yaml" - "uc4-service-monitor.yaml" + afterActions: + - delete: + selector: + apiVersion: kafka.strimzi.io/v1beta2 + kind: KafkaTopic + nameRegex: "^theodolite-.*" loadGenerator: resources: - configMap: @@ -88,8 +94,3 @@ spec: repetitionAggregation: median operator: lte threshold: 100 - kafkaConfig: - bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" - topics: - - name: "theodolite-.*" - removeOnly: True