diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt
index be6327830c34ebdbc30a85df608a1f079fbde442..ecfe516770f59c0a8b0001a124b71f30b8c37097 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt
@@ -1,60 +1,51 @@
package theodolite.benchmark
import io.fabric8.kubernetes.api.model.KubernetesResource
-import io.fabric8.kubernetes.api.model.apps.Deployment
import io.fabric8.kubernetes.client.DefaultKubernetesClient
-import org.yaml.snakeyaml.Yaml
import theodolite.k8s.YamlLoader
-import theodolite.patcher.AbstractPatcher
-import theodolite.patcher.Patcher
-import theodolite.patcher.ReplicaPatcher
+import theodolite.patcher.PatcherManager
import theodolite.util.LoadDimension
-import theodolite.util.PatcherDefinition
import theodolite.util.Resource
import theodolite.util.TypeName
-import java.io.File
-import java.io.FileInputStream
-import java.io.InputStream
-import java.lang.IllegalArgumentException
class KubernetesBenchmark(): Benchmark {
lateinit var name: String
lateinit var appResource: List<String>
lateinit var loadGenResource: List<String>
lateinit var resourceTypes: List<TypeName>
+ lateinit var loadTypes: List<TypeName>
- private fun loadKubernetesResources(resources: List<String>): List<Pair<String, KubernetesResource?>> {
+
+ private fun loadKubernetesResources(resources: List<String>): List<Pair<String, KubernetesResource>> {
val basePath = "./../../../resources/main/yaml/"
var parser = theodolite.benchmark.BenchmarkYamlParser()
val loader = YamlLoader(DefaultKubernetesClient().inNamespace("default"))
return resources
.map { resource ->
val resourcePath = "$basePath/$resource"
- val kind = parser.parse(resourcePath, HashMap<String, String>()::class.java) !!
- val k8sResource = kind["kind"]?.let { loader.loadK8sResource(it, resourcePath) }
- Pair<String, KubernetesResource?>(resource, k8sResource)
+ val kind = parser.parse(resourcePath, HashMap<String, String>()::class.java)?.get("kind") !!
+ val k8sResource = loader.loadK8sResource(kind , resourcePath)
+ Pair<String, KubernetesResource>(resource, k8sResource)
}
- }
-
- private fun createK8sPatcher(patcherDefinition: PatcherDefinition, k8sResources: List<Pair<String, KubernetesResource>>): Patcher<Int> {
- return when(patcherDefinition.type) {
- "ReplicaPatcher" -> ReplicaPatcher(k8sResources.filter { it.first == patcherDefinition.resource}.map { resource -> resource.second }[0])
- "EnvVarPatcher" -> TODO("create env var patcher")
- else -> throw IllegalArgumentException("Patcher type ${patcherDefinition.type} not fount")
}
- TODO("Use reflection to load patchers")
- }
+
+
override fun buildDeployment(load: LoadDimension, res: Resource, override: Map<String, String>): BenchmarkDeployment {
// TODO("set node selector")
val resources = loadKubernetesResources(this.appResource + this.loadGenResource)
- val patchers = this.resourceTypes.map { patcherDef -> createK8sPatcher(patcherDef.patchers[0],
- resources as List<Pair<String, KubernetesResource>>
- ) }
- // exemplary only for replica patcher
- patchers.forEach{ patcher -> patcher.patch(res.get()) }
+ val patcherManager = PatcherManager()
+
+ // patch res and load
+ patcherManager.applyPatcher(res.getType(), this.resourceTypes, resources, res.get())
+ patcherManager.applyPatcher(load.getType(), this.loadTypes, resources, load.get().toString())
+
+ resources.forEach {x -> println(x)}
+
+ // handle overrides (resource, container, variableName, variableValue)
+
return KubernetesBenchmarkDeployment(emptyList(), hashMapOf<String, Any>(), "", emptyList())
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/AbstractPatcher.kt b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/AbstractPatcher.kt
index 32819549b7bd32ba9929f83b27dc5bf469dd9966..9435a8d27a327692fee14795706a5b89fab0c263 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/AbstractPatcher.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/AbstractPatcher.kt
@@ -2,5 +2,5 @@ package theodolite.patcher
import io.fabric8.kubernetes.api.model.KubernetesResource
-abstract class AbstractPatcher<T>(k8sResource: KubernetesResource): Patcher<T> {
+abstract class AbstractPatcher(k8sResource: KubernetesResource, container: String? = null, variableName: String? = null): Patcher {
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/EnvVarPatcher.kt b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/EnvVarPatcher.kt
new file mode 100644
index 0000000000000000000000000000000000000000..e4f0e5c8d166d40dce3b852e24bfd2d4cab877ed
--- /dev/null
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/EnvVarPatcher.kt
@@ -0,0 +1,50 @@
+package theodolite.patcher
+
+import io.fabric8.kubernetes.api.model.Container
+import io.fabric8.kubernetes.api.model.EnvVar
+import io.fabric8.kubernetes.api.model.EnvVarSource
+import io.fabric8.kubernetes.api.model.KubernetesResource
+import io.fabric8.kubernetes.api.model.apps.Deployment
+
+class EnvVarPatcher(private val k8sResource: KubernetesResource, private val container: String, private val variableName: String): AbstractPatcher(k8sResource, container, variableName) {
+
+ override fun <String> patch(value: String) {
+ if (k8sResource is Deployment) {
+ this.setEnv(k8sResource, this.container,
+ mapOf(this.variableName to value) as Map<kotlin.String, kotlin.String>)
+ }
+ }
+
+ /**
+ * Sets the ContainerEvironmentVariables, creates new if variable don t exist.
+ * @param container - The Container
+ * @param map - Map of k=Name,v =Value of EnviromentVariables
+ */
+ private fun setContainerEnv(container: Container, map: Map<String, String>) {
+ map.forEach { k, v ->
+ // filter for mathing name and set value
+ val x = container.env.filter { envVar -> envVar.name == k }
+
+ if (x.isEmpty()) {
+ val newVar = EnvVar(k, v, EnvVarSource())
+ container.env.add(newVar)
+ } else {
+ x.forEach {
+ it.value = v
+ }
+ }
+ }
+ }
+
+ /**
+ * Set the environment Variable for a container
+ */
+ private fun setEnv(workloadDeployment: Deployment, containerName: String, map: Map<String, String>) {
+ workloadDeployment.spec.template.spec.containers.filter { it.name == containerName }
+ .forEach { it: Container ->
+ setContainerEnv(it, map)
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/Patcher.kt b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/Patcher.kt
index 0c1fa5b8ae24fc08f1854681b56204f6a12598f2..61c2dd5fdfa97fe66889149df991314ad53911ea 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/Patcher.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/Patcher.kt
@@ -1,5 +1,5 @@
package theodolite.patcher
-interface Patcher<T> {
- fun patch(value: T)
+interface Patcher {
+ fun <T> patch(value: T)
}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/PatcherManager.kt b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/PatcherManager.kt
new file mode 100644
index 0000000000000000000000000000000000000000..774d6d389cb63a5b6daef9e98b3be3976034f520
--- /dev/null
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/PatcherManager.kt
@@ -0,0 +1,32 @@
+package theodolite.patcher
+
+import io.fabric8.kubernetes.api.model.KubernetesResource
+import theodolite.util.PatcherDefinition
+import theodolite.util.TypeName
+import java.lang.IllegalArgumentException
+
+class PatcherManager {
+ private fun createK8sPatcher(patcherDefinition: PatcherDefinition, k8sResources: List<Pair<String, KubernetesResource>>): Patcher {
+ return when(patcherDefinition.type) {
+ "ReplicaPatcher" -> ReplicaPatcher(k8sResources.filter { it.first == patcherDefinition.resource}.map { resource -> resource.second }[0])
+ "EnvVarPatcher" -> EnvVarPatcher(k8sResources.filter { it.first == patcherDefinition.resource}.map { resource -> resource.second }[0],
+ patcherDefinition.container,
+ patcherDefinition.variableName)
+ else -> throw IllegalArgumentException("Patcher type ${patcherDefinition.type} not found")
+ }
+ }
+
+ private fun getPatcherDef(requiredType: String, resourceTypes: List<TypeName>): List<PatcherDefinition> {
+ return resourceTypes
+ .filter { type -> type.typeName == requiredType}
+ .flatMap { type -> type.patchers}
+ }
+
+ fun applyPatcher(type: String, resourceTypes: List<TypeName>, resources: List<Pair<String, KubernetesResource>>, value: Any) {
+ this.getPatcherDef(type, resourceTypes)
+ .forEach {patcherDef ->
+ createK8sPatcher(patcherDef, resources).patch(value) }
+
+ }
+
+}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/ReplicaPatcher.kt b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/ReplicaPatcher.kt
index 1d9dfb24e8828b8b6e7e30647a9aa27cd343a892..fa8c88a228aa436d095fcc3a4949080366488013 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/patcher/ReplicaPatcher.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/patcher/ReplicaPatcher.kt
@@ -3,9 +3,12 @@ package theodolite.patcher
import io.fabric8.kubernetes.api.model.KubernetesResource
import io.fabric8.kubernetes.api.model.apps.Deployment
-class ReplicaPatcher(private val k8sResource: KubernetesResource): AbstractPatcher<Int>(k8sResource){
- override fun patch(replicas: Int) {
- if (k8sResource is Deployment)
- this.k8sResource.spec.replicas = replicas
+class ReplicaPatcher(private val k8sResource: KubernetesResource): AbstractPatcher(k8sResource){
+ override fun <Int> patch(replicas: Int) {
+ if (k8sResource is Deployment) {
+ if (replicas is kotlin.Int) {
+ this.k8sResource.spec.replicas = replicas
+ }
+ }
}
}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/util/LoadDimension.kt b/theodolite-quarkus/src/main/kotlin/theodolite/util/LoadDimension.kt
index 17f1726902cfb61ee9162420ff781ae99abb55ea..52d8650504f7a246c7a58a0332a959166a8152e0 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/util/LoadDimension.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/util/LoadDimension.kt
@@ -4,4 +4,8 @@ data class LoadDimension(private val number: Int) {
public fun get(): Int {
return this.number;
}
+
+ public fun getType(): String {
+ return "NumSensors"
+ }
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/util/Resource.kt b/theodolite-quarkus/src/main/kotlin/theodolite/util/Resource.kt
index bd3e1fb691084c07617b8ecc47d674443e38590b..0afa4885153bcf56a48e0b58365e3ae10754bd44 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/util/Resource.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/util/Resource.kt
@@ -4,4 +4,8 @@ data class Resource(private val number: Int) {
public fun get(): Int {
return this.number;
}
+
+ public fun getType(): String {
+ return "Instances"
+ }
}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml b/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
index 02c35964e442fa555eb13f2ff745e090a3d9bf92..57c3e2b66498e2b66d07930485d37cac47423d65 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
@@ -8,4 +8,15 @@ resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "aggregation-deployment.yaml"
\ No newline at end of file
+ resource: "aggregation-deployment.yaml"
+loadTypes:
+ - typeName: "NumSensors"
+ patchers:
+ - type: "EnvVarPatcher"
+ resource: "workloadGenerator.yaml"
+ container: "workload-generator"
+ variableName: "NUM_SENSORS"
+EnvVars:
+ - typeName: "override"
+ patchers:
+ - type: "EnvVarPatcher"
\ No newline at end of file