Skip to content
Snippets Groups Projects
Commit 06e82962 authored by Sören Henning's avatar Sören Henning
Browse files

Minor code quality improvements

parent 4c846e8c
No related branches found
No related tags found
No related merge requests found
Pipeline #8646 passed
...@@ -21,16 +21,13 @@ class ConfigOverrideModifier(val execution: BenchmarkExecution, val resources: L ...@@ -21,16 +21,13 @@ class ConfigOverrideModifier(val execution: BenchmarkExecution, val resources: L
labelValue: String, labelValue: String,
labelName: String labelName: String
) { ) {
val additionalConfigOverrides = mutableListOf<ConfigurationOverride>() val additionalConfigOverrides = resources.map {
resources.forEach { ConfigurationOverride().apply {
run { this.patcher = PatcherDefinition()
val configurationOverride = ConfigurationOverride() this.patcher.type = "LabelPatcher"
configurationOverride.patcher = PatcherDefinition() this.patcher.properties = mapOf("variableName" to labelName)
configurationOverride.patcher.type = "LabelPatcher" this.patcher.resource = it
configurationOverride.patcher.properties = mutableMapOf("variableName" to labelName) this.value = labelValue
configurationOverride.patcher.resource = it
configurationOverride.value = labelValue
additionalConfigOverrides.add(configurationOverride)
} }
} }
execution.configOverrides.addAll(additionalConfigOverrides) execution.configOverrides.addAll(additionalConfigOverrides)
......
...@@ -24,15 +24,14 @@ class DataVolumeLoadGeneratorReplicaPatcher( ...@@ -24,15 +24,14 @@ class DataVolumeLoadGeneratorReplicaPatcher(
return resources.flatMap { patchSingeResource(it, value)} return resources.flatMap { patchSingeResource(it, value)}
} }
fun patchSingeResource(k8sResource: HasMetadata, value: String): List<HasMetadata> { private fun patchSingeResource(k8sResource: HasMetadata, value: String): List<HasMetadata> {
var resource = k8sResource
// calculate number of load generator instances and load per instance // calculate number of load generator instances and load per instance
val load = Integer.parseInt(value) val load = Integer.parseInt(value)
val loadGenInstances = (load + maxVolume - 1) / maxVolume val loadGenInstances = (load + maxVolume - 1) / maxVolume
val loadPerInstance = load / loadGenInstances val loadPerInstance = load / loadGenInstances
// Patch instance values and load value of generators // Patch instance values and load value of generators
val resourceList = ReplicaPatcher().patch(listOf(resource), loadGenInstances.toString()) val resourceList = ReplicaPatcher().patch(listOf(k8sResource), loadGenInstances.toString())
return EnvVarPatcher(this.container, this.variableName).patch(resourceList, loadPerInstance.toString()) return EnvVarPatcher(this.container, this.variableName).patch(resourceList, loadPerInstance.toString())
} }
} }
...@@ -3,13 +3,13 @@ package rocks.theodolite.kubernetes.patcher ...@@ -3,13 +3,13 @@ package rocks.theodolite.kubernetes.patcher
import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.HasMetadata
class PatchHandler { class PatchHandler {
companion object { companion object {
private fun getResourcesToPatch(resources: MutableMap<String, List<HasMetadata>>, patcherDefinition: PatcherDefinition): List<HasMetadata> { private fun getResourcesToPatch(resources: Map<String, List<HasMetadata>>, patcherDefinition: PatcherDefinition): List<HasMetadata> {
return resources[patcherDefinition.resource] return resources[patcherDefinition.resource]
?: throw InvalidPatcherConfigurationException("Could not find resource ${patcherDefinition.resource}") ?: throw InvalidPatcherConfigurationException("Could not find resource ${patcherDefinition.resource}")
} }
fun patchResource( fun patchResource(
resources: MutableMap<String, List<HasMetadata>>, resources: Map<String, List<HasMetadata>>,
patcherDefinition: PatcherDefinition, patcherDefinition: PatcherDefinition,
value: String, value: String,
): List<HasMetadata> { ): List<HasMetadata> {
......
...@@ -29,7 +29,7 @@ class ResourceLimitPatcher( ...@@ -29,7 +29,7 @@ class ResourceLimitPatcher(
} }
} }
else -> { else -> {
throw InvalidPatcherConfigurationException("ResourceLimitPatcher is not applicable for $resource") throw InvalidPatcherConfigurationException("ResourceLimitPatcher is not applicable for $resource.")
} }
} }
return resource return resource
......
...@@ -29,7 +29,7 @@ class ResourceRequestPatcher( ...@@ -29,7 +29,7 @@ class ResourceRequestPatcher(
} }
} }
else -> { else -> {
throw InvalidPatcherConfigurationException("ResourceRequestPatcher is not applicable for $resource") throw InvalidPatcherConfigurationException("ResourceRequestPatcher is not applicable for $resource.")
} }
} }
return resource return resource
......
...@@ -13,7 +13,6 @@ class TemplateLabelPatcher( ...@@ -13,7 +13,6 @@ class TemplateLabelPatcher(
val variableName: String) : val variableName: String) :
AbstractPatcher() { AbstractPatcher() {
override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata {
when (resource) { when (resource) {
is Deployment -> { is Deployment -> {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment