diff --git a/execution/helm/README.md b/execution/helm/README.md
index 6a2f083559fd0fe7b5674834e99a075e9bea1851..c545804aaec8eb8ed91054f1f7ee97dd293816a4 100644
--- a/execution/helm/README.md
+++ b/execution/helm/README.md
@@ -6,11 +6,9 @@ Install the chart via:
```sh
helm dependencies update .
-helm install my-confluent .
+helm install theodolite .
```
-**Please note: Theodolite currently uses hard-coded URLs, to connect to Kafka and Zookeeper. For that reason, the name of this chart must be `my-confluent`.** We will change this behavior soon.
-
This chart installs requirements to execute benchmarks with Theodolite.
Dependencies and subcharts:
@@ -27,7 +25,7 @@ Dependencies and subcharts:
Test the installation:
```sh
-helm test <release-name>
+helm test theodolite
```
Our test files are located [here](templates/../../theodolite-chart/templates/tests). Many subcharts have their own tests, these are also executed and are placed in the respective /templates folders.
@@ -46,18 +44,18 @@ helm install theodolite . -f preconfigs/one-broker-values.yaml
## Uninstall this Chart
-To uninstall/delete the `my-release` deployment:
+To uninstall/delete the `theodolite` deployment:
```sh
-helm delete my-release
+helm delete theodolite
```
This command does not remove the CRDs which are created by this chart. Remove them manually with:
```sh
# CRDs from Theodolite
-kubectl delete crd execution
-kubectl delete crd benchmark
+kubectl delete crd executions.theodolite.com
+kubectl delete crd benchmarks.theodolite.com
# CRDs from Prometheus operator (see https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#uninstall-chart)
kubectl delete crd alertmanagerconfigs.monitoring.coreos.com
kubectl delete crd alertmanagers.monitoring.coreos.com
diff --git a/execution/helm/templates/theodolite/thedolite-operator.yaml b/execution/helm/templates/theodolite/thedolite-operator.yaml
index cb3f193b89c3a198bab853fb85a0db1184394dce..3af9cfffd71059993688d5be77ae110a2e3cdc2d 100644
--- a/execution/helm/templates/theodolite/thedolite-operator.yaml
+++ b/execution/helm/templates/theodolite/thedolite-operator.yaml
@@ -23,9 +23,19 @@ spec:
value: {{ .Release.Namespace }}
- name: MODE
value: operator
+ - name: THEODOLITE_APP_RESOURCES
+ value: "./benchmark-resources"
+ volumeMounts:
+ - name: benchmark-resources
+ mountPath: /work/benchmark-resources
- name: lag-analysis
image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:theodolite-kotlin-latest
ports:
- containerPort: 80
- name: analysis
+ name: analysis
+ volumes:
+ - name: benchmark-resources
+ configMap:
+ name: benchmark-resources
+ optional: true
{{- end }}
diff --git a/execution/helm/values.yaml b/execution/helm/values.yaml
index f45bdc10535eb6e075d77ff903cac934f37b8801..67dab74c3931ce13a1ab0f7504a946a208b4dfb8 100644
--- a/execution/helm/values.yaml
+++ b/execution/helm/values.yaml
@@ -148,8 +148,8 @@ kafka-lag-exporter:
enabled: true
nodeSelector: {}
clusters:
- - name: "my-confluent-cp-kafka"
- bootstrapBrokers: "my-confluent-cp-kafka:9092"
+ - name: "theodolite-cp-kafka"
+ bootstrapBrokers: "theodolite-cp-kafka:9092"
## The interval between refreshing metrics
pollIntervalSeconds: 15
diff --git a/execution/uc-application/aggregation-deployment.yaml b/execution/uc-application/aggregation-deployment.yaml
index 07732ca1dd1e6b2b06f098dfb10a53d38e8d5cae..1d3ebdb20dd06433e97e112edef76d7deac17395 100644
--- a/execution/uc-application/aggregation-deployment.yaml
+++ b/execution/uc-application/aggregation-deployment.yaml
@@ -21,9 +21,9 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "my-confluent-cp-kafka:9092"
+ value: "theodolite-cp-kafka:9092"
- name: SCHEMA_REGISTRY_URL
- value: "http://my-confluent-cp-schema-registry:8081"
+ value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
- name: COMMIT_INTERVAL_MS # Set as default for the applications
diff --git a/execution/uc-workload-generator/workloadGenerator.yaml b/execution/uc-workload-generator/workloadGenerator.yaml
index 146e285f66d4c0e1a88d613e4ac2d5571234fad6..8f7cc3a8df20752eccb321242bb774c18f4e1d0a 100644
--- a/execution/uc-workload-generator/workloadGenerator.yaml
+++ b/execution/uc-workload-generator/workloadGenerator.yaml
@@ -32,6 +32,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "my-confluent-cp-kafka:9092"
+ value: "theodolite-cp-kafka:9092"
- name: SCHEMA_REGISTRY_URL
- value: "http://my-confluent-cp-schema-registry:8081"
+ value: "http://theodolite-cp-schema-registry:8081"
diff --git a/theodolite-quarkus/config/example-benchmark-yaml-resource.yaml b/theodolite-quarkus/config/example-benchmark-yaml-resource.yaml
index 42b1cd08dc1949355c97edebc92ea7b5ab8799b2..60eb3bb9c31e3eab3e70f916b450372d56db4968 100644
--- a/theodolite-quarkus/config/example-benchmark-yaml-resource.yaml
+++ b/theodolite-quarkus/config/example-benchmark-yaml-resource.yaml
@@ -20,7 +20,7 @@ loadTypes:
container: "workload-generator"
variableName: "NUM_SENSORS"
kafkaConfig:
- bootstrapServer: "my-confluent-cp-kafka:9092"
+ bootstrapServer: "theodolite-cp-kafka:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-quarkus/config/example-execution-yaml-resource.yaml b/theodolite-quarkus/config/example-execution-yaml-resource.yaml
index 80e4575d653bff8d67d8f66cf4ae9806a1fe102e..23c1587ec1e5c2a88fcf69d7127edbcc1ffdb00f 100644
--- a/theodolite-quarkus/config/example-execution-yaml-resource.yaml
+++ b/theodolite-quarkus/config/example-execution-yaml-resource.yaml
@@ -2,36 +2,34 @@ name: example-execution
benchmark: "uc1-kstreams"
load:
loadType: "NumSensors"
- loadValues:
- - 50000
+ loadValues: [25000, 50000, 75000, 100000, 125000, 150000]
resources:
resourceType: "Instances"
- resourceValues:
- - 1
+ resourceValues: [1, 2, 3, 4, 5]
slos:
- sloType: "lag trend"
- threshold: 1000
+ threshold: 2000
prometheusUrl: "http://prometheus-operated:9090"
externalSloUrl: "http://localhost:80/evaluate-slope"
offset: 0
- warmup: 0
+ warmup: 60 # in seconds
execution:
strategy: "LinearSearch"
- duration: 60
+ duration: 300 # in seconds
repetitions: 1
restrictions:
- "LowerBound"
-configOverrides:
- - patcher:
- type: "NodeSelectorPatcher"
- resource: "uc1-load-generator-deployment.yaml"
- variableName: "env"
- value: "prod"
- - patcher:
- type: "NodeSelectorPatcher"
- resource: "uc1-kstreams-deployment.yaml"
- variableName: "env"
- value: "prod"
+configOverrides: []
+# - patcher:
+# type: "NodeSelectorPatcher"
+# resource: "uc1-load-generator-deployment.yaml"
+# variableName: "env"
+# value: "prod"
+# - patcher:
+# type: "NodeSelectorPatcher"
+# resource: "uc1-kstreams-deployment.yaml"
+# variableName: "env"
+# value: "prod"
# - patcher:
# type: "ResourceLimitPatcher"
# resource: "uc1-kstreams-deployment.yaml"
diff --git a/theodolite-quarkus/config/example-operator-benchmark.yaml b/theodolite-quarkus/config/example-operator-benchmark.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..419042fdd0b1e58fed4d402b4bb329d54602d23f
--- /dev/null
+++ b/theodolite-quarkus/config/example-operator-benchmark.yaml
@@ -0,0 +1,31 @@
+apiVersion: theodolite.com/v1alpha1
+kind: benchmark
+metadata:
+ name: uc1-kstreams
+#name: "uc1-kstreams"
+appResource:
+ - "uc1-kstreams-deployment.yaml"
+ - "aggregation-service.yaml"
+ - "jmx-configmap.yaml"
+ - "uc1-service-monitor.yaml"
+loadGenResource:
+ - "uc1-load-generator-deployment.yaml"
+ - "uc1-load-generator-service.yaml"
+resourceTypes:
+ - typeName: "Instances"
+ patchers:
+ - type: "ReplicaPatcher"
+ resource: "uc1-kstreams-deployment.yaml"
+loadTypes:
+ - typeName: "NumSensors"
+ patchers:
+ - type: "EnvVarPatcher"
+ resource: "uc1-load-generator-deployment.yaml"
+ container: "workload-generator"
+ variableName: "NUM_SENSORS"
+kafkaConfig:
+ bootstrapServer: "theodolite-cp-kafka:9092"
+ topics:
+ - name: "input"
+ numPartitions: 40
+ replicationFactor: 1
\ No newline at end of file
diff --git a/theodolite-quarkus/config/example-operator-execution.yaml b/theodolite-quarkus/config/example-operator-execution.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3df1a723dd771453ab1b267335176e4ae74c3ed5
--- /dev/null
+++ b/theodolite-quarkus/config/example-operator-execution.yaml
@@ -0,0 +1,52 @@
+apiVersion: theodolite.com/v1alpha1
+kind: execution
+metadata:
+ name: example-execution
+#name: example-execution
+benchmark: "uc1-kstreams"
+load:
+ loadType: "NumSensors"
+ loadValues: [25000, 50000, 75000, 100000, 125000, 150000]
+resources:
+ resourceType: "Instances"
+ resourceValues: [1, 2, 3, 4, 5]
+slos:
+ - sloType: "lag trend"
+ threshold: 2000
+ prometheusUrl: "http://prometheus-operated:9090"
+ externalSloUrl: "http://localhost:80/evaluate-slope"
+ offset: 0
+ warmup: 60 # in seconds
+execution:
+ strategy: "LinearSearch"
+ duration: 300 # in seconds
+ repetitions: 1
+ restrictions:
+ - "LowerBound"
+configOverrides: []
+# - patcher:
+# type: "NodeSelectorPatcher"
+# resource: "uc1-load-generator-deployment.yaml"
+# variableName: "env"
+# value: "prod"
+# - patcher:
+# type: "NodeSelectorPatcher"
+# resource: "uc1-kstreams-deployment.yaml"
+# variableName: "env"
+# value: "prod"
+# - patcher:
+# type: "ResourceLimitPatcher"
+# resource: "uc1-kstreams-deployment.yaml"
+# container: "uc-application"
+# variableName: "cpu"
+# value: "1000m"
+# - patcher:
+# type: "ResourceLimitPatcher"
+# resource: "uc1-kstreams-deployment.yaml"
+# container: "uc-application"
+# variableName: "memory"
+# value: "2Gi"
+# - patcher:
+# type: "SchedulerNamePatcher"
+# resource: "uc1-kstreams-deployment.yaml"
+# value: "random-scheduler"
diff --git a/theodolite-quarkus/config/uc1-kstreams-deployment.yaml b/theodolite-quarkus/config/uc1-kstreams-deployment.yaml
index 85fe243714f9523e760ad827ef697b3dcefdc8e3..171c3446db2719ee91bd8954233015316851fcf9 100644
--- a/theodolite-quarkus/config/uc1-kstreams-deployment.yaml
+++ b/theodolite-quarkus/config/uc1-kstreams-deployment.yaml
@@ -21,9 +21,9 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "my-confluent-cp-kafka:9092"
+ value: "theodolite-cp-kafka:9092"
- name: SCHEMA_REGISTRY_URL
- value: "http://my-confluent-cp-schema-registry:8081"
+ value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
- name: COMMIT_INTERVAL_MS # Set as default for the applications
diff --git a/theodolite-quarkus/config/uc1-load-generator-deployment.yaml b/theodolite-quarkus/config/uc1-load-generator-deployment.yaml
index e49c22d6a478fbd7f3f5987222c76ca73a661cb0..374dd60113e133ef0a793149e3786efb38973287 100644
--- a/theodolite-quarkus/config/uc1-load-generator-deployment.yaml
+++ b/theodolite-quarkus/config/uc1-load-generator-deployment.yaml
@@ -31,6 +31,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "my-confluent-cp-kafka:9092"
+ value: "theodolite-cp-kafka:9092"
- name: SCHEMA_REGISTRY_URL
- value: "http://my-confluent-cp-schema-registry:8081"
+ value: "http://theodolite-cp-schema-registry:8081"