Fix #31108: support additional fqdns

Author: LEDfan

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

@@ -25,6 +25,8 @@ import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 import io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPath
 import io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPathBuilder
 import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder
+import io.fabric8.kubernetes.api.model.networking.v1.IngressRule
+import io.fabric8.kubernetes.api.model.networking.v1.IngressRuleBuilder
 import io.fabric8.kubernetes.client.KubernetesClient
 import mu.KotlinLogging
 
@@ -37,7 +39,18 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
     fun create(shinyProxy: ShinyProxy, latestShinyProxyInstance: ShinyProxyInstance) {
         val labels = LabelFactory.labelsForShinyProxy(shinyProxy).toMutableMap()
         labels[LabelFactory.LATEST_INSTANCE_LABEL] = latestShinyProxyInstance.hashOfSpec
+
         //@formatter:off
+        val fqdns = listOf(shinyProxy.fqdn) + shinyProxy.additionalFqdns
+        val rules = fqdns.map { host ->
+            IngressRuleBuilder()
+                .withHost(host)
+                .withNewHttp()
+                    .addToPaths(createPathV1(shinyProxy))
+                .endHttp()
+            .build()
+        }
+
         val ingressDefinition = IngressBuilder()
                 .withNewMetadata()
                     .withName(ResourceNameFactory.createNameForIngress(shinyProxy))
@@ -52,12 +65,7 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
                 .endMetadata()
                 .withNewSpec()
                     .withIngressClassName("nginx")
-                    .addNewRule()
-                        .withHost(shinyProxy.fqdn)
-                        .withNewHttp()
-                            .addToPaths(createPathV1(shinyProxy))
-                        .endHttp()
-                    .endRule()
+                    .withRules(rules)
                 .endSpec()
                 .build()
             //@formatter:on

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

@@ -41,7 +41,6 @@ class ShinyProxy : CustomResource<JsonNode, ShinyProxyStatus>(), Namespaced {
         return ShinyProxyStatus()
     }
 
-
     @get:JsonIgnore
     val image: String by lazy {
         if (spec.get("image")?.isTextual == true) {
@@ -66,6 +65,14 @@ class ShinyProxy : CustomResource<JsonNode, ShinyProxyStatus>(), Namespaced {
         throw IllegalStateException("Cannot create ShinyProxy instance when no FQDN is specified!")
     }
 
+    @get:JsonIgnore
+    val additionalFqdns: List<String> by lazy {
+        if (spec.get("additionalFqdns")?.isArray == true) {
+            return@lazy spec.get("additionalFqdns").elements().asSequence().map { it.textValue() }.toList();
+        }
+        return@lazy listOf()
+    }
+
     @get:JsonIgnore
     val replicas: Int by lazy {
         if (spec.get("replicas")?.isInt == true) {

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

@@ -1060,5 +1060,79 @@ class MainIntegrationTest : IntegrationTestBase() {
             job.cancel()
         }
 
+    @Test
+    fun `test additional fqns`() =
+        setup(Mode.NAMESPACED) { namespace, shinyProxyClient, namespacedClient, _, operator, reconcileListener, _ ->
+            // 1. create a SP instance
+            val spTestInstance = ShinyProxyTestInstance(
+                namespace,
+                namespacedClient,
+                shinyProxyClient,
+                "additional_fqdns.yaml",
+                reconcileListener
+            )
+            spTestInstance.create()
+
+            val (resourceRetriever, shinyProxyLister) = operator.prepare()
+            // 2. start the operator and let it do it's work
+            val job = GlobalScope.launch {
+                operator.run(resourceRetriever, shinyProxyLister)
+            }
+
+            // 3. wait until instance is created
+            spTestInstance.waitForOneReconcile()
+
+            // 4. assert correctness
+            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)
+
+            assertEquals(2, ingress.spec.rules.size)
+            val rule1 = ingress.spec.rules[0]
+            assertNotNull(rule1)
+            assertEquals(sp.fqdn, rule1.host)
+            assertEquals(1, rule1.http.paths.size)
+            val path1 = rule1.http.paths[0]
+            assertNotNull(path1)
+            assertEquals(sp.subPath, path1.path)
+            assertEquals("sp-${sp.metadata.name}-svc".take(63), path1.backend.service.name)
+            assertEquals(80, path1.backend.service.port.number)
+
+            val rule2 = ingress.spec.rules[1]
+            assertNotNull(rule2)
+            assertEquals(sp.additionalFqdns[0], rule2.host)
+            assertEquals(1, rule2.http.paths.size)
+            val path2 = rule2.http.paths[0]
+            assertNotNull(path2)
+            assertEquals(sp.subPath, path2.path)
+            assertEquals("sp-${sp.metadata.name}-svc".take(63), path2.backend.service.name)
+            assertEquals(80, path2.backend.service.port.number)
+
+            job.cancel()
+        }
+
 
 }

src/test/resources/configs/additional_fqdns.yaml

@@ -0,0 +1,36 @@
+apiVersion: openanalytics.eu/v1
+kind: ShinyProxy
+metadata:
+  name: example-shinyproxy
+spec:
+  fqdn: itest.local
+  additionalFqdns:
+    - itest2.locals
+  image: openanalytics/shinyproxy:2.6.1
+  proxy:
+    title: Open Analytics Shiny Proxy
+    logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
+    landingPage: /
+    heartbeatRate: 10000
+    heartbeatTimeout: 60000
+    port: 8080
+    authentication: simple
+    containerBackend: kubernetes
+    kubernetes:
+      namespace: itest
+    users:
+      - name: demo
+        password: demo
+        groups: scientists
+      - name: demo2
+        password: demo2
+        groups: mathematicians
+    specs:
+      - id: 01_hello
+        displayName: Hello Application
+        description: Application which demonstrates the basics of a Shiny app
+        containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
+        containerImage: openanalytics/shinyproxy-demo
+      - id: 06_tabsets
+        container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
+        container-image: openanalytics/shinyproxy-demo