diff --git a/helm/templates/theodolite/benchmark-resources-config-map.yaml b/helm/templates/theodolite/benchmark-resources-config-map.yaml
deleted file mode 100644
index 4ec1c1bd9c3b9c05cb77920c20b9b573d413c94a..0000000000000000000000000000000000000000
--- a/helm/templates/theodolite/benchmark-resources-config-map.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- $processedDict := dict -}}
-{{- range $path, $bytes := .Files.Glob "benchmark-definitions/**/resources/**" }}
-{{- $name := base (dir (dir $path)) }}
-{{- if not (hasKey $processedDict $name) -}}
-{{ $_ := set $processedDict $name "true" }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: benchmark-resources-{{ $name }}
-data:
-{{ ($.Files.Glob (printf "benchmark-definitions/%s/resources/*" $name)).AsConfig | indent 2 }}
----
-{{- end }}
-{{- end }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: benchmark-resources-custom
-data: {}
diff --git a/helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml b/helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2dd355141350921d772edb73a1e8e7795600b0d1
--- /dev/null
+++ b/helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml
@@ -0,0 +1,12 @@
+{{- range $configmap, $enabled := .Values.operator.theodoliteBenchmarks.resourceConfigMaps }}
+{{- if $enabled -}}
+{{- $name := kebabcase $configmap }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: benchmark-resources-{{ $name }}
+data:
+{{ ($.Files.Glob (printf "benchmark-definitions/%s/resources/*" $name)).AsConfig | indent 2 }}
+---
+{{- end }}
+{{- end }}
diff --git a/helm/templates/theodolite/benchmarks/benchmark.yaml b/helm/templates/theodolite/benchmarks/benchmark.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1c4cb02ea69dbed711b781535127e00e2a24f1d7
--- /dev/null
+++ b/helm/templates/theodolite/benchmarks/benchmark.yaml
@@ -0,0 +1,7 @@
+{{- range $benchmark, $enabled := .Values.operator.theodoliteBenchmarks.benchmarks }}
+{{- if $enabled -}}
+{{- $name := kebabcase $benchmark }}
+{{ $.Files.Get (printf "benchmark-definitions/%s/%s-benchmark-operator.yaml" $name $name) }}
+---
+{{- end }}
+{{- end }}
diff --git a/helm/templates/theodolite/role.yaml b/helm/templates/theodolite/role.yaml
index 0b496f3ef506e56b74acf5b7c8d0f4edc4f2cd96..43ee0e43d6974cd95548df32d6c4b1df8f3e497e 100644
--- a/helm/templates/theodolite/role.yaml
+++ b/helm/templates/theodolite/role.yaml
@@ -49,6 +49,7 @@ rules:
- theodolite.com
resources:
- benchmarks
+ - benchmarks/status
- executions
- executions/status
verbs:
diff --git a/helm/templates/theodolite/theodolite-operator.yaml b/helm/templates/theodolite/theodolite-operator.yaml
index 98e0688f79b0b2ab0a5c9c83f098c7dc545cafc5..c7ced880cbbfbb9795ef59156ea1df7d5b860ec6 100644
--- a/helm/templates/theodolite/theodolite-operator.yaml
+++ b/helm/templates/theodolite/theodolite-operator.yaml
@@ -26,31 +26,11 @@ spec:
value: {{ .Release.Namespace }}
- name: MODE
value: operator
- - name: THEODOLITE_APP_RESOURCES
- value: "./benchmark-resources"
- name: RESULTS_FOLDER
value: "./results"
volumeMounts:
- name: theodolite-results-volume
mountPath: "/deployments/results"
- - name: benchmark-resources-uc1-kstreams
- mountPath: /deployments/benchmark-resources/uc1-kstreams
- - name: benchmark-resources-uc2-kstreams
- mountPath: /deployments/benchmark-resources/uc2-kstreams
- - name: benchmark-resources-uc3-kstreams
- mountPath: /deployments/benchmark-resources/uc3-kstreams
- - name: benchmark-resources-uc4-kstreams
- mountPath: /deployments/benchmark-resources/uc4-kstreams
- - name: benchmark-resources-uc1-flink
- mountPath: /deployments/benchmark-resources/uc1-flink
- - name: benchmark-resources-uc2-flink
- mountPath: /deployments/benchmark-resources/uc2-flink
- - name: benchmark-resources-uc3-flink
- mountPath: /deployments/benchmark-resources/uc3-flink
- - name: benchmark-resources-uc4-flink
- mountPath: /deployments/benchmark-resources/uc4-flink
- - name: benchmark-resources-custom
- mountPath: /deployments/benchmark-resources/custom
{{- if .Values.operator.sloChecker.lagTrend.enabled }}
- name: lag-trend-slo-checker
image: "{{ .Values.operator.sloChecker.lagTrend.image }}:{{ .Values.operator.sloChecker.lagTrend.imageTag }}"
@@ -96,42 +76,6 @@ spec:
{{- else }}
emptyDir: {}
{{- end }}
- - name: benchmark-resources-uc1-kstreams
- configMap:
- name: benchmark-resources-uc1-kstreams
- optional: true
- - name: benchmark-resources-uc2-kstreams
- configMap:
- name: benchmark-resources-uc2-kstreams
- optional: true
- - name: benchmark-resources-uc3-kstreams
- configMap:
- name: benchmark-resources-uc3-kstreams
- optional: true
- - name: benchmark-resources-uc4-kstreams
- configMap:
- name: benchmark-resources-uc4-kstreams
- optional: true
- - name: benchmark-resources-uc1-flink
- configMap:
- name: benchmark-resources-uc1-flink
- optional: true
- - name: benchmark-resources-uc2-flink
- configMap:
- name: benchmark-resources-uc2-flink
- optional: true
- - name: benchmark-resources-uc3-flink
- configMap:
- name: benchmark-resources-uc3-flink
- optional: true
- - name: benchmark-resources-uc4-flink
- configMap:
- name: benchmark-resources-uc4-flink
- optional: true
- - name: benchmark-resources-custom
- configMap:
- name: benchmark-resources-custom
- optional: true
{{- with .Values.operator.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 2 }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 5cdb9ddbd5273ece21d32dbc7e1d2ea757248384..9de0155cf26d26bc20975d8ec6524607ac9a1d43 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -281,6 +281,29 @@ operator:
imageTag: stable
imagePullPolicy: IfNotPresent
+ theodoliteBenchmarks:
+ resourceConfigMaps:
+ uc1LoadGenerator: true
+ uc1Kstreams: true
+ uc1Flink: true
+ uc2LoadGenerator: true
+ uc2Kstreams: true
+ uc2Flink: true
+ uc3LoadGenerator: true
+ uc3Kstreams: true
+ uc3Flink: true
+ uc4LoadGenerator: true
+ uc4Kstreams: true
+ uc4Flink: true
+ benchmarks:
+ uc1Kstreams: true
+ uc1Flink: true
+ uc2Kstreams: true
+ uc2Flink: true
+ uc3Kstreams: true
+ uc3Flink: true
+ uc4Kstreams: true
+ uc4Flink: true
serviceAccount:
create: true
diff --git a/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index c5c0283f434d7a4c13da0e93a855cef7e112bbb9..841a293bbb77c4960a2532a13a009a42227223d3 100755
--- a/theodolite-benchmarks/definitions/install-configmaps.sh
+++ b/theodolite-benchmarks/definitions/install-configmaps.sh
@@ -1,17 +1,17 @@
-# flink
+# Flink
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
-# kafka
+# Kafka Streams
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
-# load generator
-kubectl create configmap benchmark-resources-uc1-loadgen --from-file uc1-loadGen
-kubectl create configmap benchmark-resources-uc2-loadgen --from-file uc2-loadGen
-kubectl create configmap benchmark-resources-uc3-loadgen --from-file uc3-loadGen
-kubectl create configmap benchmark-resources-uc4-loadgen --from-file uc4-loadGen
\ No newline at end of file
+# Load Generator
+kubectl create configmap benchmark-resources-uc1-load-generator --from-file uc1-load-generator/resources
+kubectl create configmap benchmark-resources-uc2-load-generator --from-file uc2-load-generator/resources
+kubectl create configmap benchmark-resources-uc3-load-generator --from-file uc3-load-generator/resources
+kubectl create configmap benchmark-resources-uc4-load-generator --from-file uc4-load-generator/resources
diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index fb985d4574b7c04590c0ebff963acc47b7a8f85e..89bac41ee5c8dcefa628b3cb01052df5a1df9292 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc1-loadgen"
+ name: "benchmark-resources-uc1-load-generator"
files:
- "uc1-load-generator-deployment.yaml"
- "uc1-load-generator-service.yaml"
@@ -26,14 +26,14 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc1-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
- type: "EnvVarPatcher"
- resource: "uc1-flink/jobmanager-deployment.yaml"
+ resource: "jobmanager-deployment.yaml"
properties:
container: "jobmanager"
variableName: "PARALLELISM"
- type: "EnvVarPatcher" # required?
- resource: "uc1-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
properties:
container: "taskmanager"
variableName: "PARALLELISM"
@@ -41,12 +41,12 @@ spec:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
similarity index 80%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
index 3532e5d8cb869209309111c1654e4126b3dd6d2f..fb5557c2df8b483164d3c1000717db4c7cface81 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
@@ -15,7 +15,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc1-loadgen"
+ name: "benchmark-resources-uc1-load-generator"
files:
- "uc1-load-generator-deployment.yaml"
- "uc1-load-generator-service.yaml"
@@ -23,17 +23,17 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc1-kstreams/uc1-kstreams-deployment.yaml"
+ resource: "uc1-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
similarity index 95%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
index 58f6d89d610f4eb8bd5ed34c5ab64850d7570154..5aaf87e724a4e8c728c3c15b998cb927ff57f3d5 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
@@ -11,7 +11,7 @@ sut:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc1-loadgen"
+ name: "benchmark-resources-uc1-load-generator"
files:
- "uc1-load-generator-deployment.yaml"
- "uc1-load-generator-service.yaml"
diff --git a/theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-service.yaml
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 d87d7575be5525ed78ab6ad2815dcbf66639838f..206fbf9683659fcc074341d7077da04c36909b75 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -4,21 +4,21 @@ metadata:
name: uc2-flink
spec:
sut:
- resources:
- - configMap:
- name: "benchmark-resources-uc2-flink"
- files:
- - "flink-configuration-configmap.yaml"
- - "taskmanager-deployment.yaml"
- - "taskmanager-service.yaml"
- - "service-monitor.yaml"
- - "jobmanager-service.yaml"
- - "jobmanager-deployment.yaml"
- #- "jobmanager-rest-service.yaml"
+ resources:
+ - configMap:
+ name: "benchmark-resources-uc2-flink"
+ files:
+ - "flink-configuration-configmap.yaml"
+ - "taskmanager-deployment.yaml"
+ - "taskmanager-service.yaml"
+ - "service-monitor.yaml"
+ - "jobmanager-service.yaml"
+ - "jobmanager-deployment.yaml"
+ #- "jobmanager-rest-service.yaml"
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc2-loadgen"
+ name: "benchmark-resources-uc2-load-generator"
files:
- "uc2-load-generator-deployment.yaml"
- "uc2-load-generator-service.yaml"
@@ -26,14 +26,14 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc2-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
- type: "EnvVarPatcher"
- resource: "uc2-flink/jobmanager-deployment.yaml"
+ resource: "jobmanager-deployment.yaml"
properties:
container: "jobmanager"
variableName: "PARALLELISM"
- type: "EnvVarPatcher" # required?
- resource: "uc2-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
properties:
container: "taskmanager"
variableName: "PARALLELISM"
@@ -41,12 +41,12 @@ spec:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ resource: "uc2-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ resource: "uc2-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
similarity index 65%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
index 302fe6b251415ecc94e09961d7471cdce4fdaa39..0db22fa95f46d1cb484fa1a7730b8b6801dac67c 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
@@ -4,18 +4,18 @@ metadata:
name: uc2-kstreams
spec:
sut:
- resources:
- - configMap:
- name: "benchmark-resources-uc2-kstreams"
- files:
- - "uc2-kstreams-deployment.yaml"
- - "uc2-kstreams-service.yaml"
- - "uc2-jmx-configmap.yaml"
- - "uc2-service-monitor.yaml"
+ resources:
+ - configMap:
+ name: "benchmark-resources-uc2-kstreams"
+ files:
+ - "uc2-kstreams-deployment.yaml"
+ - "uc2-kstreams-service.yaml"
+ - "uc2-jmx-configmap.yaml"
+ - "uc2-service-monitor.yaml"
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc2-loadgen"
+ name: "benchmark-resources-uc2-load-generator"
files:
- "uc2-load-generator-deployment.yaml"
- "uc2-load-generator-service.yaml"
@@ -23,17 +23,17 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
+ resource: "uc2-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ resource: "uc2-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ resource: "uc2-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
similarity index 95%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
index d70c4669ff485eeb801e6db16f9d333d843d3f51..67376d76bf0a7cc4cd47563a1d8da8dc0aa3b944 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
@@ -11,7 +11,7 @@ sut:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc2-loadgen"
+ name: "benchmark-resources-uc2-load-generator"
files:
- "uc2-load-generator-deployment.yaml"
- "uc2-load-generator-service.yaml"
diff --git a/theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-service.yaml
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 bd58d7de0b985d7f4a3f5d0a8ea01e1947de5af9..47b64d9890fc0f300ee1bd8e67acbdf7c8c4e4f9 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc3-loadgen"
+ name: "benchmark-resources-uc3-load-generator"
files:
- "uc3-load-generator-deployment.yaml"
- "uc3-load-generator-service.yaml"
@@ -26,14 +26,14 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc3-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
- type: "EnvVarPatcher"
- resource: "uc3-flink/jobmanager-deployment.yaml"
+ resource: "jobmanager-deployment.yaml"
properties:
container: "jobmanager"
variableName: "PARALLELISM"
- type: "EnvVarPatcher" # required?
- resource: "uc3-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
properties:
container: "taskmanager"
variableName: "PARALLELISM"
@@ -41,12 +41,12 @@ spec:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ resource: "uc3-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ resource: "uc3-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
similarity index 82%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
index 9151fb14ec77d3ace0cf0fe491c37dd624a335f1..25374ad92a32782857cea5924ea6482060832eac 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
@@ -15,7 +15,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc3-loadgen"
+ name: "benchmark-resources-uc3-load-generator"
files:
- "uc3-load-generator-deployment.yaml"
- "uc3-load-generator-service.yaml"
@@ -23,17 +23,17 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
+ resource: "uc3-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ resource: "uc3-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ resource: "uc3-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
similarity index 95%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
index 8783a3d5e2efffe723d52d1f260a4914a6e6f578..aa92913d2c992835078174747ea849ce296c3eb1 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
@@ -11,7 +11,7 @@ sut:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc3-loadgen"
+ name: "benchmark-resources-uc3-load-generator"
files:
- "uc3-load-generator-deployment.yaml"
- "uc3-load-generator-service.yaml"
diff --git a/theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-service.yaml
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 0ee6a3d9b2879bbb1642cb0c0bfb3984f53b66ac..8a73f5b0f87198def7b152ea52008e3d4a1aa4ee 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc4-loadgen"
+ name: "benchmark-resources-uc4-load-generator"
files:
- "uc4-load-generator-deployment.yaml"
- "uc4-load-generator-service.yaml"
@@ -26,14 +26,14 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc4-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
- type: "EnvVarPatcher"
- resource: "uc4-flink/jobmanager-deployment.yaml"
+ resource: "jobmanager-deployment.yaml"
properties:
container: "jobmanager"
variableName: "PARALLELISM"
- type: "EnvVarPatcher" # required?
- resource: "uc4-flink/taskmanager-deployment.yaml"
+ resource: "taskmanager-deployment.yaml"
properties:
container: "taskmanager"
variableName: "PARALLELISM"
@@ -41,12 +41,12 @@ spec:
- typeName: "NumNestedGroups"
patchers:
- type: "EnvVarPatcher"
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ resource: "uc4-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_NESTED_GROUPS"
- type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ resource: "uc4-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
numSensors: "4.0"
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
similarity index 84%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
index 8cb5638828d545a751f22ce94a52ff8bb6ab7e86..655db2fd4122c9e0e844eed3bfe7c0a878c6d7ec 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
@@ -15,7 +15,7 @@ spec:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc4-loadgen"
+ name: "benchmark-resources-uc4-load-generator"
files:
- "uc4-load-generator-deployment.yaml"
- "uc4-load-generator-service.yaml"
@@ -23,17 +23,17 @@ spec:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
+ resource: "uc4-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumNestedGroups"
patchers:
- type: "EnvVarPatcher"
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ resource: "uc4-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ resource: "uc4-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "150000"
numSensors: "4.0"
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
similarity index 96%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
index 39e65f36d4dbff84f1ae1bab3b76a5c912f4a7d6..5c50b6f95d796941c0b2830549ef825f4a4ff6fb 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
@@ -11,7 +11,7 @@ sut:
loadGenerator:
resources:
- configMap:
- name: "benchmark-resources-uc4-loadgen"
+ name: "benchmark-resources-uc4-load-generator"
files:
- "uc4-load-generator-deployment.yaml"
- "uc4-load-generator-service.yaml"
diff --git a/theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-service.yaml