Merge branch '248-fix' into 'master'

Fix "Deployment not deleted with Flink"

Closes #248

See merge request !177

theodolite/src/main/kotlin/theodolite/k8s/K8sManager.kt

@@ -46,8 +46,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
                 this.client.apps().deployments().delete(resource)
                 ResourceByLabelHandler(client = client)
                     .blockUntilPodsDeleted(
-                        labelName = "app",
-                        labelValue = resource.spec.selector.matchLabels["app"]!!
+                        matchLabels = resource.spec.selector.matchLabels
                     )
                 logger.info { "Deployment '${resource.metadata.name}' deleted." }
             }
@@ -59,8 +58,7 @@ class K8sManager(private val client: NamespacedKubernetesClient) {
                 this.client.apps().statefulSets().delete(resource)
                 ResourceByLabelHandler(client = client)
                     .blockUntilPodsDeleted(
-                        labelName = "app",
-                        labelValue = resource.spec.selector.matchLabels["app"]!!
+                        matchLabels = resource.spec.selector.matchLabels
                     )
                 logger.info { "StatefulSet '$resource.metadata.name' deleted." }
             }

theodolite/src/main/kotlin/theodolite/k8s/ResourceByLabelHandler.kt

@@ -99,16 +99,16 @@ class ResourceByLabelHandler(private val client: NamespacedKubernetesClient) {
      * @param [labelName] the label name
      * @param [labelValue] the value of this label
      * */
-    fun blockUntilPodsDeleted(labelName: String, labelValue: String) {
+    fun blockUntilPodsDeleted(matchLabels: MutableMap<String, String>) {
         while (
             !this.client
                 .pods()
-                .withLabel("$labelName=$labelValue")
+                .withLabels(matchLabels)
                 .list()
                 .items
                 .isNullOrEmpty()
         ) {
-            logger.info { "Wait for pods with label $labelName=$labelValue to be deleted." }
+            logger.info { "Wait for pods with label ${matchLabels.toString()} to be deleted." }
             Thread.sleep(1000)
         }
     }