fix: Fix location (no port needed)

Author: Alan Christie

README.md

@@ -95,7 +95,7 @@ cluster. The Account Server will be able to manage event streams via the URL
 
 The external web-socket service will be available on the ingress host you've specified,
 as either a `ws://` or `wss://` service, depending on the ingress configuration. If
-the host is `example.com` you should be able to connect to unsecure web sockets using
+the host is `example.com` you should be able to connect to an unsecure web socket using
 the URL `ws://example.com/event-stream/{uuid}`.
 
 To update the running image (to deploy a new tagged version) just re-run the

ansible/roles/app/defaults/main.yaml

@@ -22,8 +22,6 @@ ess_image_tag: SetMe
 
 # Required with defaults ---------------------------------------------------------------
 
-# The external port number streams are exposed on
-ess_ws_port: 80
 # Deploy the ingress definition?
 # One of 'present' or 'absent'.
 ess_ingress_state: present

ansible/roles/app/tasks/deploy.yaml

@@ -11,7 +11,6 @@
     - ess_service_account != 'SetMe'
     - ess_ws_hostname | length > 0
     - ess_ws_hostname != 'SetMe'
-    - ess_ws_port | string | length > 0
     - ess_ampq_url | length > 0
     - ess_ampq_url != 'SetMe'
 

ansible/roles/app/templates/deployment.yaml.j2

@@ -67,9 +67,11 @@ spec:
         - name: ESS_AMPQ_URL
           value: '{{ ess_ampq_url }}'
         - name: ESS_INGRESS_LOCATION
-          value: '{{ ess_ws_hostname }}:{{ ess_ws_port }}'
+          value: '{{ ess_ws_hostname }}'
+{% if ess_cert_issuer %}
         - name: ESS_INGRESS_SECURE
           value: 'yes'
+{% endif %}
         # CICD_TRIGGER_ID is variable whose value is used to force
         # a redeployment of the underlying containers. This is used in
         # situations where the origin image's tag may not have changed