From 5cfa27a94493d04bce341e56ad847e69f3e14609 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Wed, 24 Feb 2021 13:15:03 +0100
Subject: [PATCH] fix image path, small adjustments
---
.../theodolite/benchmark/KubernetesBenchmarkDeployment.kt | 4 ++--
.../src/main/resources/yaml/aggregation-deployment.yaml | 2 +-
.../src/main/resources/yaml/testBenchmarkType.yaml | 4 ++--
theodolite-quarkus/src/main/resources/yaml/testContext.yaml | 3 +--
.../src/main/resources/yaml/workloadGenerator.yaml | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt
index 227934a00..fdc5f2ad0 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt
@@ -17,12 +17,12 @@ class KubernetesBenchmarkDeployment(
): BenchmarkDeployment {
private val workloadGeneratorStateCleaner = WorkloadGeneratorStateCleaner(this.zookeeperConfig)
private val kafkaController = TopicManager(this.kafkaConfig)
- private val kubernetesManager = K8sManager(DefaultKubernetesClient().inNamespace("default")) // Maybe per resource type
+ private val kubernetesManager = K8sManager(DefaultKubernetesClient().inNamespace("theodolite-she")) // Maybe per resource type
override fun setup() {
this.workloadGeneratorStateCleaner.deleteState()
kafkaController.createTopics(this.topics)
- resources.forEach {
+ resources.forEach {
kubernetesManager.deploy(it)
}
}
diff --git a/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml b/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml
index 07732ca1d..3963fa7f1 100644
--- a/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml
@@ -15,7 +15,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: uc-application
- image: uc-app:latest
+ image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:latest
ports:
- containerPort: 5555
name: jmx
diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml b/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
index 766422d5e..ee1a808f7 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
@@ -18,10 +18,10 @@ loadTypes:
container: "workload-generator"
variableName: "NUM_SENSORS"
kafkaConfig:
- bootstrapSever: "my-confluent-cp-kafka:9092"
+ bootstrapSever: "localhost:31290"
topics:
- name: "test"
partition: "1"
replication: "1"
zookeeperConfig:
- server: "my-confluent-cp-zookeeper:2181"
\ No newline at end of file
+ server: "localhost:31953"
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/yaml/testContext.yaml b/theodolite-quarkus/src/main/resources/yaml/testContext.yaml
index f3e73ca43..5d3f39320 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testContext.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/testContext.yaml
@@ -3,8 +3,7 @@ benchmark: "benchmarkType"
load:
loadType: "NumSensors"
loadValues:
- - 1000
- - 2000
+ - 10000
resources:
resourceType: "Instances"
resourceValues:
diff --git a/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml b/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml
index 242ce5f2d..dfd66a738 100644
--- a/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml
@@ -15,7 +15,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: workload-generator
- image: workload-generator:latest
+ image: ghcr.io/cau-se/theodolite-uc1-workload-generator:theodolite-kotlin-latest
env:
# Order need to be preserved for run_uc.py
- name: NUM_SENSORS
--
GitLab