From a60f019a90baa5dc97f14176214ecabb2923ff78 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Tue, 9 Mar 2021 12:42:21 +0100
Subject: [PATCH] Use the new workload generator
---
.../execution/TheodoliteYamlExecutor.kt | 4 ++--
.../main/resources/yaml/BenchmarkType.yaml | 1 +
.../yaml/uc1-load-generator-deployment.yaml | 20 ++++++++++---------
.../yaml/uc1-load-generator-service.yaml | 16 +++++++++++++++
4 files changed, 30 insertions(+), 11 deletions(-)
create mode 100644 theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-service.yaml
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
index 95d7c57fb..a81afd722 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
@@ -9,9 +9,9 @@ class TheodoliteYamlExecutor {
// load the BenchmarkExecution and the BenchmarkType
val parser = YamlParser()
val benchmarkExecution =
- parser.parse("./../../../resources/main/yaml/testBenchmarkExecution.yaml", BenchmarkExecution::class.java)!!
+ parser.parse("./../../../resources/main/yaml/BenchmarkExecution.yaml", BenchmarkExecution::class.java)!!
val benchmark =
- parser.parse("./../../../resources/main/yaml/testBenchmarkType.yaml", KubernetesBenchmark::class.java)!!
+ parser.parse("./../../../resources/main/yaml/BenchmarkType.yaml", KubernetesBenchmark::class.java)!!
val executor = TheodoliteExecutor(benchmarkExecution, benchmark)
executor.run()
diff --git a/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
index 4a1671dec..25d9585ad 100644
--- a/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
@@ -5,6 +5,7 @@ appResource:
- "jmx-configmap.yaml"
loadGenResource:
- "uc1-load-generator-deployment.yaml"
+ - "uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
index dfd66a738..e49c22d6a 100644
--- a/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
@@ -15,20 +15,22 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: workload-generator
- image: ghcr.io/cau-se/theodolite-uc1-workload-generator:theodolite-kotlin-latest
+ image: ghcr.io/cau-se/theodolite-uc1-workload-generator:latest
+ ports:
+ - containerPort: 5701
+ name: coordination
env:
- # Order need to be preserved for run_uc.py
- name: NUM_SENSORS
value: "25000"
- - name: INSTANCES
- value: "1"
- name: NUM_NESTED_GROUPS
value: "5"
- - name: ZK_HOST
- value: "my-confluent-cp-zookeeper"
- - name: ZK_PORT
- value: "2181"
+ - name: KUBERNETES_NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: KUBERNETES_DNS_NAME
+ value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
value: "my-confluent-cp-kafka:9092"
- name: SCHEMA_REGISTRY_URL
- value: "http://my-confluent-cp-schema-registry:8081"
\ No newline at end of file
+ value: "http://my-confluent-cp-schema-registry:8081"
diff --git a/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-service.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-service.yaml
new file mode 100644
index 000000000..f8b26b3f6
--- /dev/null
+++ b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: titan-ccp-load-generator
+ labels:
+ app: titan-ccp-load-generator
+spec:
+ type: ClusterIP
+ clusterIP: None
+ selector:
+ app: titan-ccp-load-generator
+ ports:
+ - name: coordination
+ port: 5701
+ targetPort: 5701
+ protocol: TCP
--
GitLab