Fix #25930: Remove ingress before Service and Replicaset

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ShinyProxyController.kt

@@ -318,19 +318,31 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
     }
 
     fun deleteSingleShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance) {
-        logger.info { "${shinyProxy.logPrefix(shinyProxyInstance)} DeleteSingleShinyProxyInstance" }
+        logger.info { "${shinyProxy.logPrefix(shinyProxyInstance)} DeleteSingleShinyProxyInstance [Step 1/3]: Update status" }
         // Important: update status BEFORE deleting, otherwise we will start reconciling this instance, before it's completely deleted
         updateStatus(shinyProxy) {
             it.status.instances.remove(shinyProxyInstance)
         }
-        for (service in resourceRetriever.getServiceByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
-            kubernetesClient.resource(service).delete()
-        }
-        for (replicaSet in resourceRetriever.getReplicaSetByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
-            kubernetesClient.resource(replicaSet).delete()
-        }
-        for (configMap in resourceRetriever.getConfigMapByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
-            kubernetesClient.resource(configMap).delete()
+
+        // Important: remove ingress before removing the ReplicaSet. This ensures that the rotues are correclty updated in the Ingress
+        // and users aren't routed to non-existing pods
+        logger.info { "${shinyProxy.logPrefix(shinyProxyInstance)} DeleteSingleShinyProxyInstance [Step 2/3]: Update Ingress" }
+        ingressController.onRemoveInstance(shinyProxy, shinyProxyInstance)
+
+        GlobalScope.launch { // run async
+            // delete resources after delay of 30 seconds to ensure all routes are updated before deleting replicaset
+            delay(30_000)
+            logger.info { "${shinyProxy.logPrefix(shinyProxyInstance)} DeleteSingleShinyProxyInstance [Step 3/3]: Delete resources" }
+
+            for (service in resourceRetriever.getServiceByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
+                kubernetesClient.resource(service).delete()
+            }
+            for (replicaSet in resourceRetriever.getReplicaSetByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
+                kubernetesClient.resource(replicaSet).delete()
+            }
+            for (configMap in resourceRetriever.getConfigMapByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
+                kubernetesClient.resource(configMap).delete()
+            }
         }
     }
 

src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingres/IIngressController.kt

@@ -21,8 +21,11 @@
 package eu.openanalytics.shinyproxyoperator.ingres
 
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
+import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 
 interface IIngressController {
 
     fun reconcile(shinyProxy: ShinyProxy)
+
+    fun onRemoveInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance)
 }

src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressController.kt

@@ -40,7 +40,7 @@ class IngressController(
     channel: Channel<ShinyProxyEvent>,
     ingressInformer: SharedIndexInformer<Ingress>,
     shinyProxyListener: Lister<ShinyProxy>,
-    kubernetesClient: KubernetesClient,
+    private val kubernetesClient: KubernetesClient,
     private val resourceRetriever: ResourceRetriever
 ) : IIngressController {
 
@@ -65,6 +65,12 @@ class IngressController(
         }
     }
 
+    override fun onRemoveInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance) {
+        for (ingress in resourceRetriever.getIngressByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)) {
+            kubernetesClient.resource(ingress).delete()
+        }
+    }
+
     private fun reconcileSingleInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance) {
         val ingresses = resourceRetriever.getIngressByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance), shinyProxy.metadata.namespace)