diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt
index 589dee1ac2e39d107794df1e3aa85ea56d6db92b..92aaef2923ed87e2bb2c3706ac4fc862538a222f 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt
@@ -23,4 +23,4 @@ class Shutdown(private val benchmarkExecution: BenchmarkExecution, private val b
deployment.teardown()
logger.info { "Teardown completed" }
}
-}
\ No newline at end of file
+}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
index eec7796e47485c1479407e72fb92d974fa67e59f..6bddea20c05fb5c0eb6a5a3bd60b3ec2c6b9bd5d 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
@@ -28,13 +28,15 @@ class TheodoliteYamlExecutor {
val benchmark =
parser.parse(path = benchmarkPath, E = KubernetesBenchmark::class.java)!!
- val shutdown = Shutdown(benchmarkExecution, benchmark)
- Runtime.getRuntime().addShutdownHook(thread { shutdown.run()})
+ // Add shutdown hook
+ // Use thread{} with start = false, else the thread will start right away
+ val shutdown = thread(start = false) { Shutdown(benchmarkExecution, benchmark).run() }
+ Runtime.getRuntime().addShutdownHook(shutdown)
val executor = TheodoliteExecutor(benchmarkExecution, benchmark)
executor.run()
logger.info { "Theodolite finished" }
- Runtime.getRuntime().removeShutdownHook(thread { shutdown.run()})
+ Runtime.getRuntime().removeShutdownHook(shutdown)
exitProcess(0)
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
index 33b71c8fa247511c371b7a154071634db7092660..4a34f26c29f4dc087d952b030002e26a35efc523 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
@@ -7,6 +7,7 @@ import theodolite.benchmark.BenchmarkExecution
import theodolite.benchmark.BenchmarkExecutionList
import theodolite.benchmark.KubernetesBenchmark
import theodolite.benchmark.KubernetesBenchmarkList
+import theodolite.k8s.K8sContextFactory
private const val DEFAULT_NAMESPACE = "default"
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/K8sContextFactory.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sContextFactory.kt
similarity index 91%
rename from theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/K8sContextFactory.kt
rename to theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sContextFactory.kt
index 94adf61a435df743aea168c5451b2f3faa24ca17..8fd822c615da4fab37dafb6927032f64db6c4462 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/operator/K8sContextFactory.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sContextFactory.kt
@@ -1,4 +1,4 @@
-package theodolite.execution.operator
+package theodolite.k8s
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sCustomResourceWrapper.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sCustomResourceWrapper.kt
deleted file mode 100644
index 8b3ac08265d5caa75f602b18e279e36efd24e187..0000000000000000000000000000000000000000
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sCustomResourceWrapper.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package theodolite.k8s
-
-import io.fabric8.kubernetes.client.CustomResource
-import io.fabric8.kubernetes.client.NamespacedKubernetesClient
-import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext
-
-/**
-* Fabric8 handles custom resources as plain HashMaps. These need to be handled differently than normal
-* Kubernetes resources. The K8sCustomResourceWrapper class provides a wrapper to deploy and delete
-* custom resources in a uniform way.
-*
-* @property map custom resource as plain hashmap
-* @constructor Create empty K8s custom resource wrapper
-*/
-class K8sCustomResourceWrapper(private val map : Map<String,String>) : CustomResource() {
-
-
- /**
- * Deploy a custom resource
- *
- * @param client a namespaced Kubernetes client which are used to deploy the CR object.
- */
- fun deploy(client : NamespacedKubernetesClient){
- val kind = this.map["kind"]
- // Search the CustomResourceDefinition to which the CR Object belongs.
- // This should be exactly one if the CRD is registered for Kubernetes, zero otherwise.
- val crds = client.apiextensions().v1beta1().customResourceDefinitions().list()
- crds.items
- .filter { crd -> crd.toString().contains("kind=$kind") }
- .map { crd -> CustomResourceDefinitionContext.fromCrd(crd) }
- .forEach { context ->
- client.customResource(context).createOrReplace(client.configuration.namespace,this.map as Map<String, Any>)
- }
- }
-
- /**
- * Delete a custom resource
- *
- * @param client a namespaced Kubernetes client which are used to delete the CR object.
- */
- fun delete(client : NamespacedKubernetesClient){
- val kind = this.map["kind"]
- val metadata = this.map["metadata"] as HashMap<String,String>
- val name = metadata["name"]
-
- val crds = client.apiextensions().v1beta1().customResourceDefinitions().list()
- crds.items
- .filter { crd -> crd.toString().contains("kind=$kind") }
- .map { crd -> CustomResourceDefinitionContext.fromCrd(crd) }
- .forEach { context ->
- client.customResource(context).delete(client.configuration.namespace,name) }
- }
-
-}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
index 38a07545513d7713f61e484702cb48143ab3aed0..029f18c30b79bbbf36c3761ced107e23f39682d8 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
@@ -19,7 +19,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
this.client.configMaps().createOrReplace(resource)
is StatefulSet ->
this.client.apps().statefulSets().createOrReplace(resource)
- is K8sCustomResourceWrapper -> resource.deploy(client)
+ is ServiceMonitorWrapper -> resource.deploy(client)
else -> throw IllegalArgumentException("Unknown Kubernetes resource.")
}
}
@@ -34,7 +34,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
this.client.configMaps().delete(resource)
is StatefulSet ->
this.client.apps().statefulSets().delete(resource)
- is K8sCustomResourceWrapper -> resource.delete(client)
+ is ServiceMonitorWrapper -> resource.delete(client)
else -> throw IllegalArgumentException("Unknown Kubernetes resource.")
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sResourceLoader.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sResourceLoader.kt
index 658af46611ec7e1e784d286391ecf1e25a25366e..bf4af6c531064d42a9fcee1b22058850a560427d 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sResourceLoader.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sResourceLoader.kt
@@ -26,8 +26,8 @@ class K8sResourceLoader(private val client: NamespacedKubernetesClient) {
* @param path of the yaml file
* @return customResource from fabric8
*/
- fun loadCustomResource(path: String): K8sCustomResourceWrapper {
- return loadGenericResource(path) { x: String -> K8sCustomResourceWrapper(YamlParser().parse(path, HashMap<String, String>()::class.java)!!) }
+ private fun loadServiceMonitor(path: String): ServiceMonitorWrapper {
+ return loadGenericResource(path) { x: String -> ServiceMonitorWrapper(YamlParser().parse(path, HashMap<String, String>()::class.java)!!) }
}
/**
@@ -73,16 +73,11 @@ class K8sResourceLoader(private val client: NamespacedKubernetesClient) {
return when (kind) {
"Deployment" -> loadDeployment(path)
"Service" -> loadService(path)
- "ServiceMonitor" -> loadCustomResource(path)
+ "ServiceMonitor" -> loadServiceMonitor(path)
"ConfigMap" -> loadConfigmap(path)
else -> {
- logger.warn { "Try to load $kind from $path as Custom ressource" }
- try{
- loadCustomResource(path)
- } catch (e:Exception){
- logger.error { "Error during loading of unspecified CustomResource: $e" }
- throw e
- }
+ logger.error { "Error during loading of unspecified resource Kind" }
+ throw java.lang.IllegalArgumentException("error while loading resource with kind: $kind")
}
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/ServiceMonitorWrapper.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/ServiceMonitorWrapper.kt
new file mode 100644
index 0000000000000000000000000000000000000000..4950cee225e103ff095def91de64471ec1894a79
--- /dev/null
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/ServiceMonitorWrapper.kt
@@ -0,0 +1,56 @@
+package theodolite.k8s
+
+import io.fabric8.kubernetes.client.CustomResource
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient
+import mu.KotlinLogging
+
+private val logger = KotlinLogging.logger {}
+
+class ServiceMonitorWrapper(private val serviceMonitor: Map<String, String>) : CustomResource() {
+
+ /**
+ * Deploy a service monitor
+ *
+ * @param client a namespaced Kubernetes client which are used to deploy the CR object.
+ *
+ * @throws java.io.IOException if the resource could not be deployed.
+ */
+ fun deploy(client: NamespacedKubernetesClient) {
+ val serviceMonitorContext = K8sContextFactory().create(
+ api = "v1",
+ scope = "Namespaced",
+ group = "monitoring.coreos.com",
+ plural = "servicemonitors"
+ )
+ client.customResource(serviceMonitorContext)
+ .createOrReplace(client.configuration.namespace, this.serviceMonitor as Map<String, Any>)
+ }
+
+ /**
+ * Delete a service monitor
+ *
+ * @param client a namespaced Kubernetes client which are used to delete the CR object.
+ */
+ fun delete(client: NamespacedKubernetesClient) {
+ val serviceMonitorContext = K8sContextFactory().create(
+ api = "v1",
+ scope = "Namespaced",
+ group = "monitoring.coreos.com",
+ plural = "servicemonitors"
+ )
+ try {
+ client.customResource(serviceMonitorContext)
+ .delete(client.configuration.namespace, this.getServiceMonitorName())
+ } catch (e: Exception) {
+ logger.warn { "Could not delete service monitor" }
+ }
+ }
+
+ /**
+ * @throws NullPointerException if name or metadata is null
+ */
+ private fun getServiceMonitorName(): String {
+ val smAsMap = this.serviceMonitor["metadata"]!! as Map<String, String>
+ return smAsMap["name"]!!
+ }
+}