Fix #30945: add nginx.org/websocket-services

Author: LEDfan

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")

src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt

@@ -1153,14 +1153,34 @@ class MainIntegrationTest : IntegrationTestBase() {
             spTestInstance.waitForOneReconcile()
 
             // 4. assert correctness
-            spTestInstance.assertInstanceIsCorrect()
             val sp = spTestInstance.retrieveInstance()
+            assertNotNull(sp)
+            val instance = sp.status.instances[0]
+            assertNotNull(instance)
+            assertTrue(instance.isLatestInstance)
+
+            // check configmap
+            spTestInstance.assertConfigMapIsCorrect(sp)
+
+            // check replicaset
+            spTestInstance.assertReplicaSetIsCorrect(sp)
 
+            // check service
+            spTestInstance.assertServiceIsCorrect(spTestInstance.retrieveInstance())
+
+            // check ingress
             val allIngresses = namespacedClient.network().v1().ingresses().list().items
             assertEquals(1, allIngresses.size)
             val ingress = allIngresses.firstOrNull { it.metadata.name == "sp-${sp.metadata.name}-ing".take(63) }
             assertNotNull(ingress)
 
+            assertEquals(mapOf(
+                LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
+                LabelFactory.REALM_ID_LABEL to sp.realmId,
+                LabelFactory.LATEST_INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec
+            ), ingress.metadata.labels)
+
+            // nginx.org annotation was replaced
             assertEquals(mapOf(
                 "nginx.ingress.kubernetes.io/proxy-buffer-size" to "128k",
                 "nginx.ingress.kubernetes.io/ssl-redirect" to "true",

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)