From 50fcca86d87526f1ad9ae888c83ad9479120efab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sat, 17 Apr 2021 19:21:40 +0200
Subject: [PATCH] Refactor block loop
---
.../src/main/kotlin/theodolite/k8s/K8sManager.kt | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
index 88424f003..c58225bf8 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sManager.kt
@@ -45,7 +45,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
is Deployment -> {
val label = resource.spec.selector.matchLabels["app"]!!
this.client.apps().deployments().delete(resource)
- blockUntilPodDeleted(label)
+ blockUntilPodsDeleted(label)
logger.info { "Deployment '${resource.metadata.name}' deleted." }
}
is Service ->
@@ -55,7 +55,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
is StatefulSet -> {
val label = resource.spec.selector.matchLabels["app"]!!
this.client.apps().statefulSets().delete(resource)
- blockUntilPodDeleted(label)
+ blockUntilPodsDeleted(label)
logger.info { "StatefulSet '$resource.metadata.name' deleted." }
}
is ServiceMonitorWrapper -> resource.delete(client)
@@ -63,17 +63,11 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
}
}
-
- private fun blockUntilPodDeleted(podLabel: String) {
- var deleted = false
- do {
- val pods = this.client.pods().withLabel(podLabel).list().items
- if (pods.isNullOrEmpty()) {
- deleted = true
- }
+ private fun blockUntilPodsDeleted(podLabel: String) {
+ while (!this.client.pods().withLabel(podLabel).list().items.isNullOrEmpty()) {
logger.info { "Wait for pods with label '$podLabel' to be deleted." }
Thread.sleep(1000)
- } while (!deleted)
+ }
}
}
--
GitLab