From 1636e4d5116e58ca3c166e707fd628d54897e7c8 Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Feb 23 2019 17:49:33 +0000
Subject: fix the ports to be consistent with the UMB deployment


Also add a readiness check and a route for openwire-ssl, and sets
some resource limits to more reasonable values for a test
environment.

---

diff --git a/resources/openshift/templates/umb.yaml b/resources/openshift/templates/umb.yaml
index 80e7d9c..cf23e45 100644
--- a/resources/openshift/templates/umb.yaml
+++ b/resources/openshift/templates/umb.yaml
@@ -149,10 +149,10 @@ objects:
                 <memoryUsage limit="64 mb"/>
               </memoryUsage>
               <storeUsage>
-                <storeUsage limit="100 gb"/>
+                <storeUsage limit="1 gb"/>
               </storeUsage>
               <tempUsage>
-                <tempUsage limit="50 gb"/>
+                <tempUsage limit="1 gb"/>
               </tempUsage>
             </systemUsage>
           </systemUsage>
@@ -162,19 +162,20 @@ objects:
           </sslContext>
 
           <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000"/>
-            <transportConnector name="openwire+ssl" uri="ssl://0.0.0.0:61617?maximumConnections=1000&amp;wantClientAuth=true&amp;needClientAuth=true"/>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61617?maximumConnections=1000"/>
+            <transportConnector name="openwire+ssl" uri="ssl://0.0.0.0:61616?maximumConnections=1000&amp;wantClientAuth=true&amp;needClientAuth=true"/>
             <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?transport.transformer=jms"/>
             <transportConnector name="amqp+ssl" uri="amqp+ssl://0.0.0.0:5671?needClientAuth=true&amp;transport.transformer=jms"/>
-            <transportConnector name="stomp" uri="stomp://0.0.0.0:61612"/>
-            <transportConnector name="stomp+ssl" uri="stomp+ssl://0.0.0.0:61613?needClientAuth=true&amp;transport.enabledProtocols=TLSv1,TLSv1.1,TLSv1.2"/>
+            <transportConnector name="stomp" uri="stomp://0.0.0.0:61613"/>
+            <transportConnector name="stomp+ssl" uri="stomp+ssl://0.0.0.0:61612?needClientAuth=true&amp;transport.enabledProtocols=TLSv1,TLSv1.1,TLSv1.2"/>
           </transportConnectors>
         </broker>
 
       </beans>
     setenv: |
-      JAVA_MIN_MEM=512m
-      JAVA_MAX_MEM=1280m
+      export JAVA_MIN_MEM=256m
+      export JAVA_MAX_MEM=1024m
+      export KARAF_OPTS="-Dactivemq.port=61617"
 - apiVersion: v1
   kind: Secret
   metadata:
@@ -250,11 +251,16 @@ objects:
             subPath: setenv
           resources:
             requests:
-              memory: 512Mi
+              memory: 256Mi
               cpu: 300m
             limits:
-              memory: 1536Mi
+              memory: 1024Mi
               cpu: 1000m
+          readinessProbe:
+            initialDelaySeconds: 20
+            timeoutSeconds: 1
+            tcpSocket:
+              port: 61617
           ports:
           - containerPort: 1099
             name: rmi-management
@@ -265,13 +271,13 @@ objects:
           - containerPort: 8181
             name: web-console
           - containerPort: 61612
-            name: stomp
-          - containerPort: 61613
             name: stomp-ssl
+          - containerPort: 61613
+            name: stomp
           - containerPort: 61616
-            name: openwire
-          - containerPort: 61617
             name: openwire-ssl
+          - containerPort: 61617
+            name: openwire
         volumes:
         - name: umb-config-volume
           configMap:
@@ -302,16 +308,16 @@ objects:
       port: 8181
       targetPort: web-console
     - name: stomp
-      port: 61612
+      port: 61613
       targetPort: stomp
     - name: stomp-ssl
-      port: 61613
+      port: 61612
       targetPort: stomp-ssl
     - name: openwire
-      port: 61616
+      port: 61617
       targetPort: openwire
     - name: openwire-ssl
-      port: 61617
+      port: 61616
       targetPort: openwire-ssl
     selector:
       app: umb
@@ -351,3 +357,20 @@ objects:
     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
+    tls:
+      insecureEdgeTerminationPolicy: Redirect
+      termination: passthrough
+    to:
+      kind: Service
+      name: umb-${TEST_ID}-broker