feat(helm): use standard http/https port for server service

Author: ggguardian

helm/ggbridge/README.md

@@ -194,7 +194,9 @@ A Helm chart for installing ggbridge
 | server.istio.gateways | list | `[]` | Specify the existing gateway resources for Virtual Service |
 | server.service.annotations | object | `{}` | Specify server serivce annottions |
 | server.service.ports.ws.containerPort | int | `9000` | Set the server websocket container port |
-| server.service.ports.ws.port | int | `9000` | Set the server websocket service port |
+| server.service.ports.ws.port | int | `80` | Set the server websocket service port |
+| server.service.ports.wss.containerPort | int | `9000` | Set the server websocket container port |
+| server.service.ports.wss.port | int | `443` | Set the server secured websocket service port |
 | server.service.type | string | `"ClusterIP"` | Kubernetes Service type |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |

helm/ggbridge/templates/server/service.yaml

@@ -17,10 +17,17 @@ metadata:
 spec:
   type: {{ .Values.server.service.type }}
   ports:
-    - port: {{ .Values.server.service.ports.ws.port }}
+    {{- if and $.Values.tls.enabled (eq (include "ggbridge.server.trafficRouting.enabled" $) "false") }}
+    - port: {{ $.Values.server.service.ports.wss.port }}
+      targetPort: ws
+      protocol: TCP
+      name: wss
+    {{- else }}
+    - port: {{ $.Values.server.service.ports.ws.port }}
       targetPort: ws
       protocol: TCP
       name: ws
+    {{- end }}
   selector:
     {{- include "ggbridge.selectorLabels" . | nindent 4 }}
     {{- include "ggbridge.server.selectorLabels" . | nindent 4 }}
@@ -45,10 +52,17 @@ metadata:
 spec:
   type: {{ $.Values.server.service.type }}
   ports:
+    {{- if and $.Values.tls.enabled (eq (include "ggbridge.server.trafficRouting.enabled" $) "false") }}
+    - port: {{ $.Values.server.service.ports.wss.port }}
+      targetPort: ws
+      protocol: TCP
+      name: wss
+    {{- else }}
     - port: {{ $.Values.server.service.ports.ws.port }}
       targetPort: ws
       protocol: TCP
       name: ws
+    {{- end }}
   selector:
     {{- include "ggbridge.selectorLabels" $ | nindent 4 }}
     {{- include "ggbridge.server.selectorLabels" $ | nindent 4 }}

helm/ggbridge/values.yaml

@@ -311,7 +311,12 @@ server:
     ports:
       ws:
         # -- Set the server websocket service port
-        port: 9000
+        port: 80
+        # -- Set the server websocket container port
+        containerPort: 9000
+      wss:
+        # -- Set the server secured websocket service port
+        port: 443
         # -- Set the server websocket container port
         containerPort: 9000