From 8ebe823d2bd2dcdfa9005ee864ff403c4b92ea9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Tue, 23 Nov 2021 16:03:46 +0100
Subject: [PATCH] Rename load generator directory
---
.../benchmark-resources-config-map.yaml | 5 --
.../theodolite/theodolite-operator.yaml | 56 -------------------
.../definitions/install-configmaps.sh | 14 ++---
.../uc1-flink-benchmark-operator.yaml | 2 +-
.../uc1-kstreams/uc1-benchmark-operator.yaml | 2 +-
.../uc1-benchmark-standalone.yaml | 2 +-
.../uc1-load-generator-deployment.yaml | 0
.../uc1-load-generator-service.yaml | 0
.../uc2-flink-benchmark-operator.yaml | 24 ++++----
.../uc2-kstreams/uc2-benchmark-operator.yaml | 18 +++---
.../uc2-load-generator-deployment.yaml | 0
.../uc2-load-generator-service.yaml | 0
.../uc3-flink-benchmark-operator.yaml | 2 +-
.../uc3-kstreams/uc3-benchmark-operator.yaml | 2 +-
.../uc3-load-generator-deployment.yaml | 0
.../uc3-load-generator-service.yaml | 0
.../uc4-flink-benchmark-operator.yaml | 2 +-
.../uc4-kstreams/uc4-benchmark-operator.yaml | 2 +-
.../uc4-benchmark-standalone.yaml | 2 +-
.../uc4-load-generator-deployment.yaml | 0
.../uc4-load-generator-service.yaml | 0
21 files changed, 36 insertions(+), 97 deletions(-)
rename helm/templates/theodolite/{ => benchmarks}/benchmark-resources-config-map.yaml (83%)
rename theodolite-benchmarks/definitions/{uc1-loadGen => uc1-load-generator}/uc1-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/{uc1-loadGen => uc1-load-generator}/uc1-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/{uc2-loadGen => uc2-load-generator}/uc2-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/{uc2-loadGen => uc2-load-generator}/uc2-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/{uc3-loadGen => uc3-load-generator}/uc3-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/{uc3-loadGen => uc3-load-generator}/uc3-load-generator-service.yaml (100%)
rename theodolite-benchmarks/definitions/{uc4-loadGen => uc4-load-generator}/uc4-load-generator-deployment.yaml (100%)
rename theodolite-benchmarks/definitions/{uc4-loadGen => uc4-load-generator}/uc4-load-generator-service.yaml (100%)
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 4ec1c1bd9..16ef86977 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 98e0688f7..c7ced880c 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 c5c0283f4..f1fc61d9e 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 fb985d457..a8d69eb72 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 3532e5d8c..bba16304a 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 58f6d89d6..5aaf87e72 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 d87d7575b..04351892e 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 302fe6b25..053f82296 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 bd58d7de0..8938fdefc 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 9151fb14e..6bef321ae 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 0ee6a3d9b..cd25c0315 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 8cb563882..456924a23 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 39e65f36d..5c50b6f95 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
--
GitLab