From aca4ca4830467a3cbef0a7b630ecd00908c1e090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Tue, 20 Jul 2021 17:32:37 +0200
Subject: [PATCH] Change directory structure of benchmark defs
---
.../definitions/install-configmaps.sh | 25 ++++------
.../definitions/uc1-benchmark-operator.yaml | 36 --------------
.../flink-configuration-configmap.yaml | 0
.../jobmanager-deployment.yaml | 0
.../jobmanager-rest-service.yaml | 0
.../{ => resources}/jobmanager-service.yaml | 0
.../{ => resources}/service-monitor.yaml | 0
.../taskmanager-deployment.yaml | 0
.../{ => resources}/taskmanager-service.yaml | 0
.../uc1-flink-benchmark-operator.yaml | 0
.../{ => resources}/uc1-jmx-configmap.yaml | 0
.../uc1-kstreams-deployment.yaml | 0
.../{ => resources}/uc1-kstreams-service.yaml | 0
.../uc1-load-generator-deployment.yaml | 0
.../uc1-load-generator-service.yaml | 0
.../{ => resources}/uc1-service-monitor.yaml | 0
.../uc1-kstreams/uc1-benchmark-operator.yaml | 18 +++----
.../definitions/uc2-benchmark-operator.yaml | 41 ----------------
.../flink-configuration-configmap.yaml | 0
.../jobmanager-deployment.yaml | 0
.../jobmanager-rest-service.yaml | 0
.../{ => resources}/jobmanager-service.yaml | 0
.../{ => resources}/service-monitor.yaml | 0
.../taskmanager-deployment.yaml | 0
.../{ => resources}/taskmanager-service.yaml | 0
.../uc2-flink-benchmark-operator.yaml | 0
.../{ => resources}/uc2-jmx-configmap.yaml | 0
.../uc2-kstreams-deployment.yaml | 0
.../{ => resources}/uc2-kstreams-service.yaml | 0
.../uc2-load-generator-deployment.yaml | 0
.../uc2-load-generator-service.yaml | 0
.../{ => resources}/uc2-service-monitor.yaml | 0
.../uc2-kstreams/uc2-benchmark-operator.yaml | 22 ++++-----
.../definitions/uc3-benchmark-operator.yaml | 41 ----------------
.../flink-configuration-configmap.yaml | 0
.../jobmanager-deployment.yaml | 0
.../jobmanager-rest-service.yaml | 0
.../{ => resources}/jobmanager-service.yaml | 0
.../{ => resources}/service-monitor.yaml | 0
.../taskmanager-deployment.yaml | 0
.../{ => resources}/taskmanager-service.yaml | 0
.../uc3-flink-benchmark-operator.yaml | 0
.../{ => resources}/uc3-jmx-configmap.yaml | 0
.../uc3-kstreams-deployment.yaml | 0
.../{ => resources}/uc3-kstreams-service.yaml | 0
.../uc3-load-generator-deployment.yaml | 0
.../uc3-load-generator-service.yaml | 0
.../{ => resources}/uc3-service-monitor.yaml | 0
.../uc3-kstreams/uc3-benchmark-operator.yaml | 22 ++++-----
.../definitions/uc4-benchmark-operator.yaml | 48 -------------------
.../flink-configuration-configmap.yaml | 0
.../jobmanager-deployment.yaml | 0
.../jobmanager-rest-service.yaml | 0
.../{ => resources}/jobmanager-service.yaml | 0
.../{ => resources}/service-monitor.yaml | 0
.../taskmanager-deployment.yaml | 0
.../{ => resources}/taskmanager-service.yaml | 0
.../uc4-flink-benchmark-operator.yaml | 0
.../{ => resources}/uc4-jmx-configmap.yaml | 0
.../uc4-kstreams-deployment.yaml | 0
.../{ => resources}/uc4-kstreams-service.yaml | 0
.../uc4-load-generator-deployment.yaml | 0
.../uc4-load-generator-service.yaml | 0
.../{ => resources}/uc4-service-monitor.yaml | 0
.../uc4-kstreams/uc4-benchmark-operator.yaml | 22 ++++-----
65 files changed, 50 insertions(+), 225 deletions(-)
delete mode 100644 theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/flink-configuration-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/jobmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/jobmanager-rest-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/jobmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/service-monitor.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/taskmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-flink/{ => resources}/taskmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/{ => uc1-flink}/uc1-flink-benchmark-operator.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-jmx-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-kstreams-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-kstreams-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc1-kstreams/{ => resources}/uc1-service-monitor.yaml (100%)
delete mode 100644 theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/flink-configuration-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/jobmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/jobmanager-rest-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/jobmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/service-monitor.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/taskmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-flink/{ => resources}/taskmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/{ => uc2-flink}/uc2-flink-benchmark-operator.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-jmx-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-kstreams-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-kstreams-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc2-kstreams/{ => resources}/uc2-service-monitor.yaml (100%)
delete mode 100644 theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/flink-configuration-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/jobmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/jobmanager-rest-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/jobmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/service-monitor.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/taskmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-flink/{ => resources}/taskmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/{ => uc3-flink}/uc3-flink-benchmark-operator.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-jmx-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-kstreams-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-kstreams-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc3-kstreams/{ => resources}/uc3-service-monitor.yaml (100%)
delete mode 100644 theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/flink-configuration-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/jobmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/jobmanager-rest-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/jobmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/service-monitor.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/taskmanager-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-flink/{ => resources}/taskmanager-service.yaml (100%)
rename theodolite-benchmarks/definitions/{ => uc4-flink}/uc4-flink-benchmark-operator.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-jmx-configmap.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-kstreams-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-kstreams-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/uc4-kstreams/{ => resources}/uc4-service-monitor.yaml (100%)
diff --git a/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index feb408be0..7ddd606a1 100755
--- a/theodolite-benchmarks/definitions/install-configmaps.sh
+++ b/theodolite-benchmarks/definitions/install-configmaps.sh
@@ -1,17 +1,8 @@
-cd uc1-flink/
-kubectl create configmap benchmark-resources-uc1-flink --from-file .
-cd ../uc2-flink/
-kubectl create configmap benchmark-resources-uc2-flink --from-file .
-cd ../uc3-flink/
-kubectl create configmap benchmark-resources-uc3-flink --from-file .
-cd ../uc4-flink/
-kubectl create configmap benchmark-resources-uc4-flink --from-file .
-cd ../uc1-kstreams/
-kubectl create configmap benchmark-resources-uc1-kstreams --from-file .
-cd ../uc2-kstreams/
-kubectl create configmap benchmark-resources-uc2-kstreams --from-file .
-cd ../uc3-kstreams/
-kubectl create configmap benchmark-resources-uc3-kstreams --from-file .
-cd ../uc4-kstreams/
-kubectl create configmap benchmark-resources-uc4-kstreams --from-file .
-cd ..
\ No newline at end of file
+kubectl create configmap benchmark-resources-uc1-flink --from-file uc1-flink/resources
+kubectl create configmap benchmark-resources-uc2-flink --from-file uc2-flink/resources
+kubectl create configmap benchmark-resources-uc3-flink --from-file uc3-flink/resources
+kubectl create configmap benchmark-resources-uc4-flink --from-file uc4-flink/resources
+kubectl create configmap benchmark-resources-uc1-kstreams --from-file uc1-kstreams/resources
+kubectl create configmap benchmark-resources-uc2-kstreams --from-file uc2-kstreams/resources
+kubectl create configmap benchmark-resources-uc3-kstreams --from-file uc3-kstreams/resources
+kubectl create configmap benchmark-resources-uc4-kstreams --from-file uc4-kstreams/resources
\ No newline at end of file
diff --git a/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml
deleted file mode 100644
index 4ec3b08d8..000000000
--- a/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc1-kstreams
-spec:
- appResource:
- - "uc1-kstreams/uc1-kstreams-deployment.yaml"
- - "uc1-kstreams/uc1-kstreams-service.yaml"
- - "uc1-kstreams/uc1-jmx-configmap.yaml"
- - "uc1-kstreams/uc1-service-monitor.yaml"
- loadGenResource:
- - "uc1-kstreams/uc1-load-generator-deployment.yaml"
- - "uc1-kstreams/uc1-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc1-kstreams/uc1-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: "NumSensorsLoadGeneratorReplicaPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc1-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-service-monitor.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 6964c1f91..4ec3b08d8 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
@@ -4,28 +4,28 @@ metadata:
name: uc1-kstreams
spec:
appResource:
- - "uc1-kstreams-deployment.yaml"
- - "uc1-kstreams-service.yaml"
- - "uc1-jmx-configmap.yaml"
- - "uc1-service-monitor.yaml"
+ - "uc1-kstreams/uc1-kstreams-deployment.yaml"
+ - "uc1-kstreams/uc1-kstreams-service.yaml"
+ - "uc1-kstreams/uc1-jmx-configmap.yaml"
+ - "uc1-kstreams/uc1-service-monitor.yaml"
loadGenResource:
- - "uc1-load-generator-deployment.yaml"
- - "uc1-load-generator-service.yaml"
+ - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ - "uc1-kstreams/uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc1-kstreams-deployment.yaml"
+ resource: "uc1-kstreams/uc1-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc1-load-generator-deployment.yaml"
+ resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: "NumSensorsLoadGeneratorReplicaPatcher"
- resource: "uc1-load-generator-deployment.yaml"
+ resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
deleted file mode 100644
index aa25c53d7..000000000
--- a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc2-kstreams
-spec:
- appResource:
- - "uc2-kstreams/uc2-kstreams-deployment.yaml"
- - "uc2-kstreams/uc2-kstreams-service.yaml"
- - "uc2-kstreams/uc2-jmx-configmap.yaml"
- - "uc2-kstreams/uc2-service-monitor.yaml"
- loadGenResource:
- - "uc2-kstreams/uc2-load-generator-deployment.yaml"
- - "uc2-kstreams/uc2-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-service-monitor.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index b65bbdedb..aa25c53d7 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc2-kstreams
spec:
- metadata:
- name: uc2-kstreams
appResource:
- - "uc2-kstreams-deployment.yaml"
- - "uc2-kstreams-service.yaml"
- - "uc2-jmx-configmap.yaml"
- - "uc2-service-monitor.yaml"
+ - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+ - "uc2-kstreams/uc2-kstreams-service.yaml"
+ - "uc2-kstreams/uc2-jmx-configmap.yaml"
+ - "uc2-kstreams/uc2-service-monitor.yaml"
loadGenResource:
- - "uc2-load-generator-deployment.yaml"
- - "uc2-load-generator-service.yaml"
+ - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ - "uc2-kstreams/uc2-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc2-kstreams-deployment.yaml"
+ resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc2-load-generator-deployment.yaml"
+ resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-load-generator-deployment.yaml"
+ resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
deleted file mode 100644
index e2679ed86..000000000
--- a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc3-kstreams
-spec:
- appResource:
- - "uc3-kstreams/uc3-kstreams-deployment.yaml"
- - "uc3-kstreams/uc3-kstreams-service.yaml"
- - "uc3-kstreams/uc3-jmx-configmap.yaml"
- - "uc3-kstreams/uc3-service-monitor.yaml"
- loadGenResource:
- - "uc3-kstreams/uc3-load-generator-deployment.yaml"
- - "uc3-kstreams/uc3-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-service-monitor.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index bfbd7191c..e2679ed86 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc3-kstreams
spec:
- metadata:
- name: uc3-kstreams
appResource:
- - "uc3-kstreams-deployment.yaml"
- - "uc3-kstreams-service.yaml"
- - "uc3-jmx-configmap.yaml"
- - "uc3-service-monitor.yaml"
+ - "uc3-kstreams/uc3-kstreams-deployment.yaml"
+ - "uc3-kstreams/uc3-kstreams-service.yaml"
+ - "uc3-kstreams/uc3-jmx-configmap.yaml"
+ - "uc3-kstreams/uc3-service-monitor.yaml"
loadGenResource:
- - "uc3-load-generator-deployment.yaml"
- - "uc3-load-generator-service.yaml"
+ - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ - "uc3-kstreams/uc3-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc3-kstreams-deployment.yaml"
+ resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc3-load-generator-deployment.yaml"
+ resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-load-generator-deployment.yaml"
+ resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
deleted file mode 100644
index 3e10fd1ae..000000000
--- a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc4-kstreams
-spec:
- appResource:
- - "uc4-kstreams/uc4-kstreams-deployment.yaml"
- - "uc4-kstreams/uc4-kstreams-service.yaml"
- - "uc4-kstreams/uc4-jmx-configmap.yaml"
- - "uc4-kstreams/uc4-service-monitor.yaml"
- loadGenResource:
- - "uc4-kstreams/uc4-load-generator-deployment.yaml"
- - "uc4-kstreams/uc4-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumNestedGroups"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- numSensors: "4.0"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "configuration"
- numPartitions: 40
- replicationFactor: 1
- - name: "aggregation-feedback"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-service-monitor.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 0ed48c9af..3e10fd1ae 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc4-kstreams
spec:
- metadata:
- name: uc4-kstreams
appResource:
- - "uc4-kstreams-deployment.yaml"
- - "uc4-kstreams-service.yaml"
- - "uc4-jmx-configmap.yaml"
- - "uc4-service-monitor.yaml"
+ - "uc4-kstreams/uc4-kstreams-deployment.yaml"
+ - "uc4-kstreams/uc4-kstreams-service.yaml"
+ - "uc4-kstreams/uc4-jmx-configmap.yaml"
+ - "uc4-kstreams/uc4-service-monitor.yaml"
loadGenResource:
- - "uc4-load-generator-deployment.yaml"
- - "uc4-load-generator-service.yaml"
+ - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ - "uc4-kstreams/uc4-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc4-kstreams-deployment.yaml"
+ resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumNestedGroups"
patchers:
- type: "EnvVarPatcher"
- resource: "uc4-load-generator-deployment.yaml"
+ resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-load-generator-deployment.yaml"
+ resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
numSensors: "4.0"
--
GitLab