diff --git a/helm/templates/theodolite/benchmark-resources-config-map.yaml b/helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml
similarity index 83%
rename from helm/templates/theodolite/benchmark-resources-config-map.yaml
rename to helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml
index 4ec1c1bd9c3b9c05cb77920c20b9b573d413c94a..16ef86977ed464b5d8a04ffa537567b1011182a0 100644
--- a/helm/templates/theodolite/benchmark-resources-config-map.yaml
+++ b/helm/templates/theodolite/benchmarks/benchmark-resources-config-map.yaml
@@ -12,8 +12,3 @@ data:
---
{{- end }}
{{- end }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: benchmark-resources-custom
-data: {}
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/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index c5c0283f434d7a4c13da0e93a855cef7e112bbb9..f1fc61d9e2f9d2e19a82b8e83e024f3f9bdfc5f9 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
+kubectl create configmap benchmark-resources-uc2-load-generator --from-file uc2-load-generator
+kubectl create configmap benchmark-resources-uc3-load-generator --from-file uc3-load-generator
+kubectl create configmap benchmark-resources-uc4-load-generator --from-file uc4-load-generator
\ No newline at end of file
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..a8d69eb723302b851008fff538e29c9b16d703a3 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"
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 3532e5d8cb869209309111c1654e4126b3dd6d2f..bba16304a4967def8c72767b9d97fbf50083ba37 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-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"
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
index 58f6d89d610f4eb8bd5ed34c5ab64850d7570154..5aaf87e724a4e8c728c3c15b998cb927ff57f3d5 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-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/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/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/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/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..04351892e034194e114c58b263b0103f10f38d63 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"
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index 302fe6b251415ecc94e09961d7471cdce4fdaa39..053f822966ab3433ce7e2b6fc5d719da49cfc051 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-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"
diff --git a/theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/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/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/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/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..8938fdefc82012d12cf6ecf7b5c1fdf1dbc1fd9b 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"
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index 9151fb14ec77d3ace0cf0fe491c37dd624a335f1..6bef321ae53484440e53ad3960649b98effdfa91 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-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"
diff --git a/theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/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/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/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/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..cd25c0315bb5ed4156e9011a23e718afbdd88100 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"
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 8cb5638828d545a751f22ce94a52ff8bb6ab7e86..456924a23676e49b5419fe70b336f7a4b8cef206 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-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"
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
index 39e65f36d4dbff84f1ae1bab3b76a5c912f4a7d6..5c50b6f95d796941c0b2830549ef825f4a4ff6fb 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-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/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/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/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/uc4-load-generator-service.yaml