Merge branch 'store-results-in-volume' into adjust-benchmark-def-for-operator

execution/helm/templates/theodolite/crd-benchmark.yaml

-{{- if .Values.benchmarkCRD.create -}}
+{{- if .Values.operator.benchmarkCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

execution/helm/templates/theodolite/crd-execution.yaml

+{{- if .Values.operator.executionCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -126,3 +127,4 @@ spec:
     subresources:
       status: {}
   scope: Namespaced
+{{- end }}

execution/helm/templates/theodolite/theodolite-operator.yaml

@@ -19,8 +19,8 @@ spec:
         runAsUser: 0 # Set the permissions for write access to the volumes.
       containers:
         - name: theodolite
-          image: ghcr.io/cau-se/theodolite:theodolite-kotlin-latest
-          imagePullPolicy: Always
+          image: "{{ .Values.operator.image }}:{{ .Values.operator.imageTag }}"
+          imagePullPolicy: "{{ .Values.operator.imagePullPolicy }}"
           env:
             - name: NAMESPACE
               value: {{ .Release.Namespace }}
@@ -31,8 +31,10 @@ spec:
             - name: RESULTS_FOLDER
               value: "results"
           volumeMounts:
+            {{- if .Values.operator.resultsVolume.enabled }}
             - name: theodolite-pv-storage
               mountPath: "/deployments/results"
+            {{- end }}
             - name: benchmark-resources-uc1-kstreams
               mountPath: /deployments/benchmark-resources/uc1-kstreams
             - name: benchmark-resources-uc2-kstreams
@@ -49,17 +51,22 @@ spec:
               mountPath: /deployments/benchmark-resources/uc3-flink
             - name: benchmark-resources-uc4-flink
               mountPath: /deployments/benchmark-resources/uc4-flink
-        - name: lag-analysis
-          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:theodolite-kotlin-latest
-          imagePullPolicy: Always
+        {{- if .Values.operator.sloChecker.lagTrend.enabled }}
+        - name: lag-trend-slo-checker
+          image: "{{ .Values.operator.sloChecker.lagTrend.image }}:{{ .Values.operator.sloChecker.lagTrend.imageTag }}"
+          imagePullPolicy: "{{ .Values.operator.sloChecker.lagTrend.imagePullPolicy }}"
           ports:
           - containerPort: 80
             name: analysis
           env:
           - name: LOG_LEVEL
             value: INFO
+        {{- end }}
+        {{- if and .Values.operator.resultsVolume.enabled .Values.operator.resultsVolume.accessSidecar.enabled }}
         - name: results-access
           image: busybox:stable
+          image: "{{ .Values.operator.resultsVolume.accessSidecar.image }}:{{ .Values.operator.resultsVolume.accessSidecar.imageTag }}"
+          imagePullPolicy: "{{ .Values.operator.resultsVolume.accessSidecar.imagePullPolicy }}"
           command:
           - sh
           - -c
@@ -67,10 +74,13 @@ spec:
           volumeMounts:
           - mountPath: /results
             name: theodolite-pv-storage
+        {{- end }}
       volumes:
+      {{- if .Values.operator.resultsVolume.enabled }}
       - name: theodolite-pv-storage
         persistentVolumeClaim:
-          claimName: theodolite-pv-claim
+          claimName: {{ .Values.operator.resultsVolume.persistentVolumeClaim.name | quote }}
+      {{- end }}
       - name: benchmark-resources-uc1-kstreams
         configMap:
           name: benchmark-resources-uc1-kstreams

execution/helm/values.yaml

@@ -246,12 +246,33 @@ prometheus:
 operator:
   enabled: true
   
+  image: ghcr.io/cau-se/theodolite
+  imageTag: theodolite-kotlin-latest
+  imagePullPolicy: Always
+
   executionCRD:
     create: true
-
   benchmarkCRD:
     create: true
 
+  sloChecker:
+    lagTrend:
+      enabled: true
+      image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend
+      imageTag: theodolite-kotlin-latest
+      imagePullPolicy: Always
+
+  resultsVolume:
+    enabled: true
+    persistentVolumeClaim:
+      name: theodolite-pv-claim
+    accessSidecar:
+      enabled: true
+      image: busybox
+      imageTag: stable
+      imagePullPolicy: IfNotPresent
+
+
 serviceAccount:
   create: true
 

execution/infrastructure/grafana/dashboard-config-map.yaml

@@ -252,7 +252,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "sum by(group, topic) (kafka_consumergroup_group_lag > 0)",
+            "expr": "sum by(group, topic) (kafka_consumergroup_group_lag >= 0)",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{topic}}",