Fix orphaned resources during operator update

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/LabelFactory.kt

@@ -27,12 +27,16 @@ object LabelFactory {
 
     fun labelsForShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): Map<String, String> {
         val hashOfSpec = shinyProxyInstance.hashOfSpec
-        return mapOf(
+        val labels = hashMapOf(
             APP_LABEL to APP_LABEL_VALUE,
             REALM_ID_LABEL to shinyProxy.realmId,
             INSTANCE_LABEL to hashOfSpec,
-            REVISION_LABEL to shinyProxyInstance.revision.toString()
         )
+        if (shinyProxyInstance.revision != null) {
+            // only match on revision label, if a revision is set, ensure backwards compatibility
+            labels[REVISION_LABEL] = shinyProxyInstance.revision.toString()
+        }
+        return labels
     }
 
     fun labelsForShinyProxy(shinyProxy: ShinyProxy): Map<String, String> {

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

@@ -135,7 +135,7 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
         val revision = if (existingInstance != null) {
             logger.info { "${shinyProxy.logPrefix(existingInstance)} Trying to create new instance which already exists and is not the latest instance. Therefore this instance will become the latest again" }
             // reconcile will take care of making this the latest instance again
-            existingInstance.revision + 1
+            (existingInstance.revision ?: 0) + 1
         } else {
             0
         }
@@ -286,7 +286,7 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
                 val instancesToCheck = shinyProxy.status.instances.toList()
                 for (shinyProxyInstance in instancesToCheck) {
                     val latestRevision = shinyProxy.status.getInstanceByHash(shinyProxyInstance.hashOfSpec)?.revision ?: 0
-                    if (shinyProxyInstance.isLatestInstance || (shinyProxyInstance.hashOfSpec == shinyProxy.hashOfCurrentSpec && shinyProxyInstance.revision >= latestRevision)) {
+                    if (shinyProxyInstance.isLatestInstance || (shinyProxyInstance.hashOfSpec == shinyProxy.hashOfCurrentSpec && shinyProxyInstance.revision != null && shinyProxyInstance.revision >= latestRevision)) {
                         // shinyProxyInstance is either the latest or the soon to be latest instance
                         continue
                     }
@@ -321,9 +321,6 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
             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()
             }

src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxyInstance.kt

@@ -20,4 +20,4 @@
  */
 package eu.openanalytics.shinyproxyoperator.crd
 
-data class ShinyProxyInstance(val hashOfSpec: String, var isLatestInstance: Boolean, val revision: Int = 0)
+data class ShinyProxyInstance(val hashOfSpec: String, var isLatestInstance: Boolean, val revision: Int? = null)

src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxyStatus.kt

@@ -29,7 +29,7 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
 data class ShinyProxyStatus(val instances: ArrayList<ShinyProxyInstance> = arrayListOf()) : KubernetesResource {
 
     fun getInstanceByHash(hash: String): ShinyProxyInstance? {
-        return instances.filter { it.hashOfSpec == hash }.maxByOrNull { it.revision }
+        return instances.filter { it.hashOfSpec == hash }.maxByOrNull { it.revision ?: 0 }
     }
 
     fun latestInstance(): ShinyProxyInstance? {