From 813e0b6d417e045d843eb060066b760bd14fc9f2 Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Oct 09 2019 01:37:09 +0000
Subject: create NodePorts for connecting to the UMB


Expose non-HTTP protocols via NodePorts. Remove unnecessary and non-functional routes
for those protocols. Also remove unused ports from the Service, to avoid exhausting
the limited NodePort space. Create a single route for the web console.

---

diff --git a/resources/openshift/templates/umb.yaml b/resources/openshift/templates/umb.yaml
index cf23e45..90e36cf 100644
--- a/resources/openshift/templates/umb.yaml
+++ b/resources/openshift/templates/umb.yaml
@@ -294,28 +294,17 @@ objects:
       service: broker
       environment: test-${TEST_ID}
   spec:
+    type: NodePort
     ports:
-    - name: rmi-management
-      port: 1099
-      targetPort: rmi-management
     - name: amqps
       port: 5671
       targetPort: amqps
-    - name: amqp
-      port: 5672
-      targetPort: amqp
     - name: web-console
       port: 8181
       targetPort: web-console
-    - name: stomp
-      port: 61613
-      targetPort: stomp
     - name: stomp-ssl
       port: 61612
       targetPort: stomp-ssl
-    - name: openwire
-      port: 61617
-      targetPort: openwire
     - name: openwire-ssl
       port: 61616
       targetPort: openwire-ssl
@@ -326,51 +315,17 @@ objects:
 - apiVersion: v1
   kind: Route
   metadata:
-    name: umb-${TEST_ID}-amqps
+    name: umb-${TEST_ID}-web
     labels:
       app: umb
       service: broker
       environment: test-${TEST_ID}
   spec:
     port:
-      targetPort: amqps
-    tls:
-      insecureEdgeTerminationPolicy: Redirect
-      termination: passthrough
-    to:
-      kind: Service
-      name: umb-${TEST_ID}-broker
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: umb-${TEST_ID}-stomp-ssl
-    labels:
-      app: umb
-      service: broker
-      environment: test-${TEST_ID}
-  spec:
-    port:
-      targetPort: stomp-ssl
-    tls:
-      insecureEdgeTerminationPolicy: Redirect
-      termination: passthrough
-    to:
-      kind: Service
-      name: umb-${TEST_ID}-broker
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: umb-${TEST_ID}-openwire-ssl
-    labels:
-      app: umb
-      service: broker
-      environment: test-${TEST_ID}
-  spec:
-    port:
-      targetPort: openwire-ssl
+      targetPort: web-console
     tls:
       insecureEdgeTerminationPolicy: Redirect
-      termination: passthrough
+      termination: edge
     to:
       kind: Service
       name: umb-${TEST_ID}-broker