Rename load generator directory

helm/templates/theodolite/benchmark-resources-config-map.yaml → 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: {}

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 }}

theodolite-benchmarks/definitions/install-configmaps.sh

-# 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
+# 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

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"

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"

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"

theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml

@@ -18,7 +18,7 @@ spec:
   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"

theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml

@@ -15,7 +15,7 @@ spec:
   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"

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"

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"

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"

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"

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"