change patcherDefinition in order to use a map for all configuration params

theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt

@@ -183,7 +183,7 @@ class TheodoliteController(
                 val configurationOverride = ConfigurationOverride()
                 configurationOverride.patcher = PatcherDefinition()
                 configurationOverride.patcher.type = "LabelPatcher"
-                configurationOverride.patcher.variableName = labelName
+                configurationOverride.patcher.config = mutableListOf(hashMapOf("key" to "variableName",  "value" to labelName))
                 configurationOverride.patcher.resource = it
                 configurationOverride.value = labelValue
                 additionalConfigOverrides.add(configurationOverride)

theodolite-quarkus/src/main/kotlin/theodolite/patcher/AbstractPatcher.kt

@@ -20,7 +20,5 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
  *
  */
 abstract class AbstractPatcher(
-    k8sResource: KubernetesResource,
-    container: String? = null,
-    variableName: String? = null
+    k8sResource: KubernetesResource
 ) : Patcher

theodolite-quarkus/src/main/kotlin/theodolite/patcher/EnvVarPatcher.kt

@@ -16,7 +16,7 @@ class EnvVarPatcher(
     private val k8sResource: KubernetesResource,
     private val container: String,
     private val variableName: String
-) : AbstractPatcher(k8sResource, container, variableName) {
+) : AbstractPatcher(k8sResource) {
 
     override fun <String> patch(value: String) {
         if (k8sResource is Deployment) {

theodolite-quarkus/src/main/kotlin/theodolite/patcher/ImagePatcher.kt

@@ -11,7 +11,7 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet
  * @param container Container to be patched.
  */
 class ImagePatcher(private val k8sResource: KubernetesResource, private val container: String) :
-    AbstractPatcher(k8sResource, container) {
+    AbstractPatcher(k8sResource) {
 
     override fun <String> patch(imagePath: String) {
         if (k8sResource is Deployment) {

theodolite-quarkus/src/main/kotlin/theodolite/patcher/LabelPatcher.kt

@@ -8,10 +8,9 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet
 import io.fabric8.kubernetes.client.CustomResource
 
 class LabelPatcher(private val k8sResource: KubernetesResource, val variableName: String) :
-    AbstractPatcher(k8sResource, variableName) {
+    AbstractPatcher(k8sResource) {
 
     override fun <String> patch(labelValue: String) {
-        println("call patcher for resource $k8sResource !")
         if(labelValue is kotlin.String){
             when(k8sResource){
                 is Deployment -> {

theodolite-quarkus/src/main/kotlin/theodolite/patcher/NodeSelectorPatcher.kt

@@ -10,7 +10,7 @@ import io.fabric8.kubernetes.api.model.apps.Deployment
  * @param variableName The `label-key` of the node for which the `label-value` is to be patched.
  */
 class NodeSelectorPatcher(private val k8sResource: KubernetesResource, private val variableName: String) :
-    AbstractPatcher(k8sResource, variableName) {
+    AbstractPatcher(k8sResource) {
     override fun <String> patch(value: String) {
         if (k8sResource is Deployment) {
             k8sResource.spec.template.spec.nodeSelector = mapOf(variableName to value as kotlin.String)

theodolite-quarkus/src/main/kotlin/theodolite/patcher/NumNestedGroupsLoadGeneratorReplicaPatcher.kt

@@ -4,16 +4,17 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.api.model.apps.Deployment
 import kotlin.math.pow
 
-private const val NUM_SENSORS = 4.0
-private const val LOAD_GEN_MAX_RECORDS = 150000
-
-class NumNestedGroupsLoadGeneratorReplicaPatcher(private val k8sResource: KubernetesResource) :
+class NumNestedGroupsLoadGeneratorReplicaPatcher(
+    private val k8sResource: KubernetesResource,
+    private val numSensors: String,
+    private val loadGenMaxRecords: String
+    ) :
     AbstractPatcher(k8sResource) {
     override fun <String> patch(value: String) {
         if (k8sResource is Deployment) {
             if (value is kotlin.String) {
-                val approxNumSensors = NUM_SENSORS.pow(Integer.parseInt(value).toDouble())
-                val loadGenInstances = (approxNumSensors + LOAD_GEN_MAX_RECORDS - 1) / LOAD_GEN_MAX_RECORDS
+                val approxNumSensors =  numSensors.toDouble().pow(Integer.parseInt(value).toDouble())
+                val loadGenInstances = (approxNumSensors + loadGenMaxRecords.toDouble() - 1) / loadGenMaxRecords.toDouble()
                 this.k8sResource.spec.replicas = loadGenInstances.toInt()
             }
         }

theodolite-quarkus/src/main/kotlin/theodolite/patcher/NumSensorsLoadGeneratorReplicaPatcher.kt

@@ -3,14 +3,16 @@ package theodolite.patcher
 import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.api.model.apps.Deployment
 
-private const val LOAD_GEN_MAX_RECORDS = 150000
 
-class NumSensorsLoadGeneratorReplicaPatcher(private val k8sResource: KubernetesResource) :
+class NumSensorsLoadGeneratorReplicaPatcher(
+    private val k8sResource: KubernetesResource,
+    private val loadGenMaxRecords: String
+) :
     AbstractPatcher(k8sResource) {
     override fun <String> patch(value: String) {
         if (k8sResource is Deployment) {
             if (value is kotlin.String) {
-                val loadGenInstances = (Integer.parseInt(value) + LOAD_GEN_MAX_RECORDS - 1) / LOAD_GEN_MAX_RECORDS
+                val loadGenInstances = (Integer.parseInt(value) + loadGenMaxRecords.toInt() - 1) / loadGenMaxRecords.toInt()
                 this.k8sResource.spec.replicas = loadGenInstances
             }
         }

theodolite-quarkus/src/main/kotlin/theodolite/patcher/PatcherFactory.kt

@@ -28,27 +28,50 @@ class PatcherFactory {
         k8sResources: List<Pair<String, KubernetesResource>>
     ): Patcher {
         val resource =
-            k8sResources.filter { it.first == patcherDefinition.resource }.map { resource -> resource.second }.firstOrNull()
+            k8sResources.filter { it.first == patcherDefinition.resource }
+                .map { resource -> resource.second }
+                .firstOrNull()
                 ?: throw DeploymentFailedException("Could not find resource ${patcherDefinition.resource}")
 
+
         return when (patcherDefinition.type) {
-            "ReplicaPatcher" -> ReplicaPatcher(resource)
-            "NumNestedGroupsLoadGeneratorReplicaPatcher" -> NumNestedGroupsLoadGeneratorReplicaPatcher(resource)
-            "NumSensorsLoadGeneratorReplicaPatcher" -> NumSensorsLoadGeneratorReplicaPatcher(resource)
-            "EnvVarPatcher" -> EnvVarPatcher(resource, patcherDefinition.container, patcherDefinition.variableName)
-            "NodeSelectorPatcher" -> NodeSelectorPatcher(resource, patcherDefinition.variableName)
+            "ReplicaPatcher" -> ReplicaPatcher(
+                k8sResource = resource
+            )
+            "NumNestedGroupsLoadGeneratorReplicaPatcher" -> NumNestedGroupsLoadGeneratorReplicaPatcher(
+                k8sResource = resource,
+                loadGenMaxRecords = patcherDefinition.getValueByKey("loadGenMaxRecords"),
+                numSensors = patcherDefinition.getValueByKey("numSensors")
+            )
+            "NumSensorsLoadGeneratorReplicaPatcher" -> NumSensorsLoadGeneratorReplicaPatcher(
+                k8sResource = resource,
+                loadGenMaxRecords = patcherDefinition.getValueByKey("loadGenMaxRecords")
+            )
+            "EnvVarPatcher" -> EnvVarPatcher(
+                k8sResource = resource,
+                container = patcherDefinition.getValueByKey("container"),
+                variableName = patcherDefinition.getValueByKey("variableName")
+            )
+            "NodeSelectorPatcher" -> NodeSelectorPatcher(
+                k8sResource = resource,
+                variableName = patcherDefinition.getValueByKey("variableName"))
             "ResourceLimitPatcher" -> ResourceLimitPatcher(
-                resource,
-                patcherDefinition.container,
-                patcherDefinition.variableName
+                k8sResource = resource,
+                container = patcherDefinition.getValueByKey("container"),
+                limitedResource = patcherDefinition.getValueByKey("limitedResource")
             )
             "ResourceRequestPatcher" -> ResourceRequestPatcher(
-                resource,
-                patcherDefinition.container,
-                patcherDefinition.variableName
+                k8sResource = resource,
+                container = patcherDefinition.getValueByKey("container"),
+                requestedResource = patcherDefinition.getValueByKey("requestedResource")
+            )
+            "SchedulerNamePatcher" -> SchedulerNamePatcher(
+                k8sResource = resource
+            )
+            "LabelPatcher" -> LabelPatcher(
+                k8sResource = resource,
+                variableName = patcherDefinition.getValueByKey("variableName")
             )
-            "SchedulerNamePatcher" -> SchedulerNamePatcher(resource)
-            "LabelPatcher" -> LabelPatcher(resource, patcherDefinition.variableName)
             else -> throw IllegalArgumentException("Patcher type ${patcherDefinition.type} not found")
         }
     }

theodolite-quarkus/src/main/kotlin/theodolite/patcher/ResourceLimitPatcher.kt

@@ -18,7 +18,7 @@ class ResourceLimitPatcher(
     private val k8sResource: KubernetesResource,
     private val container: String,
     private val limitedResource: String
-) : AbstractPatcher(k8sResource, container, limitedResource) {
+) : AbstractPatcher(k8sResource) {
 
     override fun <String> patch(value: String) {
         when (k8sResource) {

theodolite-quarkus/src/main/kotlin/theodolite/patcher/ResourceRequestPatcher.kt

@@ -18,7 +18,7 @@ class ResourceRequestPatcher(
     private val k8sResource: KubernetesResource,
     private val container: String,
     private val requestedResource: String
-) : AbstractPatcher(k8sResource, container, requestedResource) {
+) : AbstractPatcher(k8sResource) {
 
     override fun <String> patch(value: String) {
         when (k8sResource) {

theodolite-quarkus/src/main/kotlin/theodolite/util/InvalidPatcherConfigurationException.kt

+package theodolite.util
+
+class InvalidPatcherConfigurationException(message:String): Exception(message) {
+}
+

theodolite-quarkus/src/main/kotlin/theodolite/util/PatcherDefinition.kt

 package theodolite.util
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import io.quarkus.runtime.annotations.RegisterForReflection
 
 /**
@@ -19,13 +20,24 @@ class PatcherDefinition {
      */
     lateinit var resource: String
 
-    /**
-     * The container which the patcher is applied to
-     */
-    lateinit var container: String
+    @JsonSerialize
+    lateinit var config: MutableList<Map<String, String>>
 
-    /**
-     * The variable name for the patcher
-     */
-    lateinit var variableName: String
+    fun getValueByKey(key: String): String {
+        val value = this.config
+            .filter { it["key"] == key }
+            .map {
+                try {
+                    it.getValue("value")
+                } catch (e: Exception) {
+                    throw InvalidPatcherConfigurationException("No value found for key $key.")
+                }
+            }
+
+        return when {
+            value.isEmpty() -> throw InvalidPatcherConfigurationException("Required argument $key missing.")
+            value.size > 1 -> throw InvalidPatcherConfigurationException("Can not handle duplicate declaration for key $key.")
+            else -> value.first()
+        }
+    }
 }

theodolite-quarkus/src/main/resources/operator/benchmarkCRD.yaml

@@ -54,10 +54,15 @@ spec:
                           resource:
                             type: string
                             default: ""
-                          container:
+                          config:
+                            type: array
+                            items:
+                              type: object
+                              properties:
+                                key:
                                   type: string
                                   default: ""
-                          variableName:
+                                value:
                                   type: string
                                   default: ""
               loadTypes:
@@ -80,10 +85,15 @@ spec:
                           resource:
                             type: string
                             default: ""
-                          container:
+                          config:
+                            type: array
+                            items:
+                              type: object
+                              properties:
+                                key:
                                   type: string
                                   default: ""
-                          variableName:
+                                value:
                                   type: string
                                   default: ""
               kafkaConfig:

theodolite-quarkus/src/main/resources/operator/example-benchmark-k8s-resource.yaml

@@ -22,8 +22,11 @@ spec:
       patchers:
         - type: "EnvVarPatcher"
           resource: "uc1-load-generator-deployment.yaml"
-          container: "workload-generator"
-          variableName: "NUM_SENSORS"
+          config:
+            - key: container
+              value: "workload-generator"
+            - key: variableName
+              value: "NUM_SENSORS"
   kafkaConfig:
     bootstrapServer: "localhost:31290"
     topics:

theodolite-quarkus/src/main/resources/operator/example-execution-k8s-resource.yaml

@@ -27,15 +27,10 @@ spec:
     restrictions:
       - "LowerBound"
   configOverrides:
-    - patcher:
-        type: "NodeSelectorPatcher"
-        resource: "uc1-load-generator-deployment.yaml"
-        container: ""
-        variableName: "env"
-      value: "prod"
     - patcher:
         type: "NodeSelectorPatcher"
         resource: "uc1-kstreams-deployment.yaml"
-        container: ""
-        variableName: "env"
+        config: 
+          - key: variableName
+            value: env
       value: "prod"

theodolite-quarkus/src/main/resources/operator/executionCRD.yaml

@@ -95,10 +95,15 @@ spec:
                         resource:
                           type: string
                           default: ""
-                        container:
+                        config:
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              key:
                                 type: string
                                 default: ""
-                        variableName:
+                              value:
                                 type: string
                                 default: ""
                     value: