From 652c1b644a7b1a69da53d18bc03b6596f0397cbb Mon Sep 17 00:00:00 2001
From: Tobia De Koninck <tobia.dekoninck@openanalytics.eu>
Date: Mon, 26 Feb 2024 15:02:44 +0100
Subject: [PATCH] Fix #30945: add nginx.org/websocket-services

---
 .../shinyproxyoperator/components/IngressFactory.kt         | 1 +
 .../shinyproxyoperator/helpers/ShinyProxyTestInstance.kt    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/IngressFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/IngressFactory.kt
index 6ef1c9a..dff7025 100644
--- a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/IngressFactory.kt
+++ b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/IngressFactory.kt
@@ -54,6 +54,7 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
                 .withNewMetadata()
                     .withName(ResourceNameFactory.createNameForIngress(shinyProxy))
                     .withLabels<String, String>(labels)
+                    .withAnnotations<String, String>(mapOf("nginx.org/websocket-services" to ResourceNameFactory.createNameForService(shinyProxy)))
                     .addNewOwnerReference()
                         .withController(true)
                         .withKind("ShinyProxy")
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt
index ece172a..4d7d93c 100644
--- a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt
+++ b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt
@@ -127,6 +127,12 @@ class ShinyProxyTestInstance(private val namespace: String,
             LabelFactory.LATEST_INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec
         ), ingress.metadata.labels)
 
+        assertEquals(mapOf(
+            "nginx.org/websocket-services" to "sp-${sp.metadata.name}-svc".take(63),
+        ),
+            ingress.metadata.annotations
+        )
+
         assertOwnerReferenceIsCorrect(ingress, sp)
 
         assertEquals(1, ingress.spec.rules.size)