From 8d350e0dc336ef15899734ac88f06606c9e265b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 15 Jul 2021 15:19:10 +0200
Subject: [PATCH] Fix benchmark API format

---
 .../uc1-flink-benchmark-operator.yaml         |  84 +++++++-------
 .../definitions/uc2-benchmark-operator.yaml   |  72 ++++++------
 .../uc2-flink-benchmark-operator.yaml         |  94 ++++++++--------
 .../definitions/uc3-benchmark-operator.yaml   |  72 ++++++------
 .../uc3-flink-benchmark-operator.yaml         |  94 ++++++++--------
 .../definitions/uc4-benchmark-operator.yaml   |  85 +++++++-------
 .../uc4-flink-benchmark-operator.yaml         | 106 +++++++++---------
 7 files changed, 318 insertions(+), 289 deletions(-)

diff --git a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
index 684c93c29..30e2d6bca 100644
--- a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
@@ -1,43 +1,47 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc1-flink
-appResource:
-  - "uc1-flink/flink-configuration-configmap.yaml"
-  - "uc1-flink/taskmanager-deployment.yaml"
-  - "uc1-flink/taskmanager-service.yaml"
-  - "uc1-flink/service-monitor.yaml"
-  - "uc1-flink/jobmanager-service.yaml"
-  - "uc1-flink/jobmanager-deployment.yaml"
-  #- "uc1-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-  - "uc1-kstreams/uc1-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc1-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc1-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc1-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
\ No newline at end of file
+spec:
+  appResource:
+    - "uc1-flink/flink-configuration-configmap.yaml"
+    - "uc1-flink/taskmanager-deployment.yaml"
+    - "uc1-flink/taskmanager-service.yaml"
+    - "uc1-flink/service-monitor.yaml"
+    - "uc1-flink/jobmanager-service.yaml"
+    - "uc1-flink/jobmanager-deployment.yaml"
+    #- "uc1-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+    - "uc1-kstreams/uc1-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc1-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc1-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc1-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  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"
+  kafkaConfig:
+    bootstrapServer: "theodolite-cp-kafka:9092"
+    topics:
+      - name: "input"
+        numPartitions: 40
+        replicationFactor: 1
\ No newline at end of file
diff --git a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
index 3e52605d8..aa25c53d7 100644
--- a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
@@ -1,37 +1,41 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc2-kstreams
-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"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+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-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
index 438f02f90..4bc67808c 100644
--- a/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
@@ -1,48 +1,52 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc2-flink
-appResource:
-  - "uc2-flink/flink-configuration-configmap.yaml"
-  - "uc2-flink/taskmanager-deployment.yaml"
-  - "uc2-flink/taskmanager-service.yaml"
-  - "uc2-flink/service-monitor.yaml"
-  - "uc2-flink/jobmanager-service.yaml"
-  - "uc2-flink/jobmanager-deployment.yaml"
-  #- "uc2-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-  - "uc2-kstreams/uc2-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc2-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc2-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc2-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc2-flink/flink-configuration-configmap.yaml"
+    - "uc2-flink/taskmanager-deployment.yaml"
+    - "uc2-flink/taskmanager-service.yaml"
+    - "uc2-flink/service-monitor.yaml"
+    - "uc2-flink/jobmanager-service.yaml"
+    - "uc2-flink/jobmanager-deployment.yaml"
+    #- "uc2-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+    - "uc2-kstreams/uc2-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc2-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc2-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc2-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  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"
+  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-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
index d543dc2e5..e2679ed86 100644
--- a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
@@ -1,37 +1,41 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc3-kstreams
-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"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+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-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
index 00552c528..f7a05c137 100644
--- a/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
@@ -1,48 +1,52 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc3-flink
-appResource:
-  - "uc3-flink/flink-configuration-configmap.yaml"
-  - "uc3-flink/taskmanager-deployment.yaml"
-  - "uc3-flink/taskmanager-service.yaml"
-  - "uc3-flink/service-monitor.yaml"
-  - "uc3-flink/jobmanager-service.yaml"
-  - "uc3-flink/jobmanager-deployment.yaml"
-  #- "uc3-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-  - "uc3-kstreams/uc3-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc3-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc3-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc3-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumSensors"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_SENSORS"
-      - type: NumSensorsLoadGeneratorReplicaPatcher
-        resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
-kafkaConfig:
-  bootstrapServer: "theodolite-cp-kafka:9092"
-  topics:
-    - name: "input"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "output"
-      numPartitions: 40
-      replicationFactor: 1
-    - name: "theodolite-.*"
-      removeOnly: True
+spec:
+  appResource:
+    - "uc3-flink/flink-configuration-configmap.yaml"
+    - "uc3-flink/taskmanager-deployment.yaml"
+    - "uc3-flink/taskmanager-service.yaml"
+    - "uc3-flink/service-monitor.yaml"
+    - "uc3-flink/jobmanager-service.yaml"
+    - "uc3-flink/jobmanager-deployment.yaml"
+    #- "uc3-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+    - "uc3-kstreams/uc3-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc3-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc3-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc3-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  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"
+  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/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
index ed71d9cef..3e10fd1ae 100644
--- a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
@@ -1,43 +1,48 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc4-kstreams
-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"
-        container: "workload-generator"
-        variableName: "NUM_NESTED_GROUPS"
-      - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-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
+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-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
index 814dc9b19..523167286 100644
--- a/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
@@ -1,54 +1,58 @@
-apiVersion: theodolite.com/v1alpha1
+apiVersion: theodolite.com/v1
 kind: benchmark
 metadata:
   name: uc4-flink
-appResource:
-  - "uc4-flink/flink-configuration-configmap.yaml"
-  - "uc4-flink/taskmanager-deployment.yaml"
-  - "uc4-flink/taskmanager-service.yaml"
-  - "uc4-flink/service-monitor.yaml"
-  - "uc4-flink/jobmanager-service.yaml"
-  - "uc4-flink/jobmanager-deployment.yaml"
-  #- "uc4-flink/jobmanager-rest-service.yaml"
-loadGenResource:
-  - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-  - "uc4-kstreams/uc4-load-generator-service.yaml"
-resourceTypes:
-  - typeName: "Instances"
-    patchers:
-      - type: "ReplicaPatcher"
-        resource: "uc4-flink/taskmanager-deployment.yaml"
-      - type: "EnvVarPatcher"
-        resource: "uc4-flink/jobmanager-deployment.yaml"
-        container: "jobmanager"
-        variableName: "PARALLELISM"
-      - type: "EnvVarPatcher" # required?
-        resource: "uc4-flink/taskmanager-deployment.yaml"
-        container: "taskmanager"
-        variableName: "PARALLELISM"
-loadTypes:
-  - typeName: "NumNestedGroups"
-    patchers:
-      - type: "EnvVarPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-        container: "workload-generator"
-        variableName: "NUM_NESTED_GROUPS"
-      - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
-        resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
-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
+spec:
+  appResource:
+    - "uc4-flink/flink-configuration-configmap.yaml"
+    - "uc4-flink/taskmanager-deployment.yaml"
+    - "uc4-flink/taskmanager-service.yaml"
+    - "uc4-flink/service-monitor.yaml"
+    - "uc4-flink/jobmanager-service.yaml"
+    - "uc4-flink/jobmanager-deployment.yaml"
+    #- "uc4-flink/jobmanager-rest-service.yaml"
+  loadGenResource:
+    - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+    - "uc4-kstreams/uc4-load-generator-service.yaml"
+  resourceTypes:
+    - typeName: "Instances"
+      patchers:
+        - type: "ReplicaPatcher"
+          resource: "uc4-flink/taskmanager-deployment.yaml"
+        - type: "EnvVarPatcher"
+          resource: "uc4-flink/jobmanager-deployment.yaml"
+          properties:
+            container: "jobmanager"
+            variableName: "PARALLELISM"
+        - type: "EnvVarPatcher" # required?
+          resource: "uc4-flink/taskmanager-deployment.yaml"
+          properties:
+            container: "taskmanager"
+            variableName: "PARALLELISM"
+  loadTypes:
+    - typeName: "NumNestedGroups"
+      patchers:
+        - type: "EnvVarPatcher"
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+          properties:
+            container: "workload-generator"
+            variableName: "NUM_NESTED_GROUPS"
+        - type: "NumNestedGroupsLoadGeneratorReplicaPatcher"
+          resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+  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
-- 
GitLab