Spawn new SP instance when config updates

Author: LEDfan

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

@@ -46,7 +46,7 @@ class ResourceListener<T : HasMetadata>(private val channel: SendChannel<ShinyPr
         val hashOfInstance = resource.metadata.labels[LabelFactory.INSTANCE_LABEL] ?: TODO("Should not happen")
         val shinyProxyInstance = shinyProxy.status.getInstanceByHash(hashOfInstance) ?: TODO("Should not happen")
 
-        channel.send(ShinyProxyEvent(ShinyProxyEventType.UPDATE_DEPENDENCY, shinyProxy, shinyProxyInstance))
+        channel.send(ShinyProxyEvent(ShinyProxyEventType.RECONCILE, shinyProxy, shinyProxyInstance))
     }
 
 

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

@@ -55,18 +55,18 @@ class ShinyProxyController(private val kubernetesClient: KubernetesClient,
 
                 when (event.eventType) {
                     ShinyProxyEventType.ADD -> {
-                        reconcileSingleShinyProxy(event.shinyProxy, event.shinyProxyInstance)
+                        val newInstance = createNewInstance(event.shinyProxy)
+                        reconcileSingleShinyProxyInstance(event.shinyProxy, newInstance)
                     }
-                    ShinyProxyEventType.UPDATE -> {
-                        // TODO calculate hash -> reconcile
-                        reconcileSingleShinyProxy(event.shinyProxy, event.shinyProxyInstance)
+                    ShinyProxyEventType.UPDATE_SPEC -> {
+                        val newInstance = createNewInstance(event.shinyProxy)
+                        reconcileSingleShinyProxyInstance(event.shinyProxy, newInstance)
                     }
                     ShinyProxyEventType.DELETE -> {
                         // DELETE is not needed
-//                        deleteSingleShinyProxy(event.shinyProxy)
                     }
-                    ShinyProxyEventType.UPDATE_DEPENDENCY -> {
-                        reconcileSingleShinyProxy(event.shinyProxy, event.shinyProxyInstance)
+                    ShinyProxyEventType.RECONCILE -> {
+                        reconcileSingleShinyProxyInstance(event.shinyProxy, event.shinyProxyInstance)
                     }
                 }
 
@@ -90,24 +90,37 @@ class ShinyProxyController(private val kubernetesClient: KubernetesClient,
 //        }
 //    }
 
-    private suspend fun reconcileSingleShinyProxy(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance?) {
-        logger.info { "ReconcileSingleShinyProxy: ${shinyProxy.metadata.name}" }
+    private fun createNewInstance(shinyProxy: ShinyProxy): ShinyProxyInstance {
+        val existingInstance = shinyProxy.status.getInstanceByHash(shinyProxy.calculateHashOfCurrentSpec())
 
-        if (shinyProxy.status.instances.isEmpty()) {
-            val instance = ShinyProxyInstance()
-            instance.hashOfSpec = shinyProxy.calculateHashOfCurrentSpec()
-            instance.isLatestInstance = true
-            shinyProxy.status.instances.add(instance)
+        if (existingInstance != null && existingInstance.isLatestInstance == true) {
+            logger.warn { "Trying to create new instance which already exists and is the latest instance" }
+            return existingInstance
+        } else if (existingInstance != null && existingInstance.isLatestInstance == false) {
+            shinyProxy.status.instances.forEach { it.isLatestInstance = false }
+            existingInstance.isLatestInstance = true
             shinyProxyClient.updateStatus(shinyProxy)
-            return
+            return existingInstance
         }
 
+        val newInstance = ShinyProxyInstance()
+        newInstance.hashOfSpec = shinyProxy.calculateHashOfCurrentSpec()
+        newInstance.isLatestInstance = true
+        shinyProxy.status.instances.forEach { it.isLatestInstance = false }
+        shinyProxy.status.instances.add(newInstance)
+        shinyProxyClient.updateStatus(shinyProxy)
+        return newInstance
+    }
+
+    private suspend fun reconcileSingleShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance?) {
+        logger.info { "ReconcileSingleShinyProxy: ${shinyProxy.metadata.name}" }
+
         if (shinyProxyInstance == null) {
-            TODO("Should not happend")
+            TODO("Should not happen")
         }
 
         if (shinyProxyInstance.hashOfSpec == null) {
-            TODO("Should not happend")
+            TODO("Should not happen")
         }
 
         val configMaps = resourceRetriever.getConfigMapByLabels(LabelFactory.labelsForShinyProxyInstance(shinyProxy, shinyProxyInstance))

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

@@ -2,7 +2,7 @@ package eu.openanalytics.shinyproxyoperator.controller
 
 enum class ShinyProxyEventType {
     ADD,
-    UPDATE,
+    UPDATE_SPEC,
     DELETE,
-    UPDATE_DEPENDENCY
+    RECONCILE
 }

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

@@ -27,17 +27,12 @@ class ShinyProxyListener(private val channel: SendChannel<ShinyProxyEvent>,
                 println("Old hash: ${shinyProxy.calculateHashOfCurrentSpec()}")
                 println("New hash: ${newShinyProxy.calculateHashOfCurrentSpec()}")
 
-                val shinyProxyInstance = if (shinyProxy.calculateHashOfCurrentSpec() == newShinyProxy.calculateHashOfCurrentSpec()) {
-                    shinyProxy.status.getInstanceByHash(shinyProxy.calculateHashOfCurrentSpec())
+                if (shinyProxy.calculateHashOfCurrentSpec() == newShinyProxy.calculateHashOfCurrentSpec()) {
+                    val shinyProxyInstance = shinyProxy.status.getInstanceByHash(shinyProxy.calculateHashOfCurrentSpec()) ?: TODO("This should not happen")
+                    runBlocking { channel.send(ShinyProxyEvent(ShinyProxyEventType.RECONCILE, shinyProxy, shinyProxyInstance)) }
                 } else {
-                    TODO("New SP instance should be created")
+                    runBlocking { channel.send(ShinyProxyEvent(ShinyProxyEventType.UPDATE_SPEC, newShinyProxy, null)) }
                 }
-
-                if (shinyProxyInstance == null) {
-                    TODO("This should not happen")
-                }
-
-                runBlocking { channel.send(ShinyProxyEvent(ShinyProxyEventType.UPDATE, shinyProxy, shinyProxyInstance)) }
             }
 
             override fun onDelete(shinyProxy: ShinyProxy, b: Boolean) {