Add option to override relay port by contour config (#96)

Signed-off-by: Anton Rubets <[email protected]>

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## Added
+- Option to override Relay external host in config from [plejik](https://github.com/plejik)
+
 ## [0.2.6] - 2023-09-25
 
 ### Changed

charts/ztka/README.md

@@ -95,7 +95,9 @@ helm show values paralus/ztka
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | contour | object | contour subchart overwrite | the chart will overwrite some values of contour subchart. |
+| contour.envoy.hostPorts | object | `{"http":80,"https":443}` | Envoy host ports. |
 | contour.envoy.service.annotations | object | `{}` | Annotations for Envoy service. |
+| contour.envoy.service.type | string | `"LoadBalancer"` | Type of Envoy service to create. |
 | deploy.contour.enable | bool | `true` | auto install contour ingress controller |
 | deploy.contour.tls | object | `{}` | TLS properties of the virtual host |
 | deploy.elasticsearch.address | string | `""` | Elasticsearch address. Required when `deploy.elasticsearch.enable` is unset. |

charts/ztka/templates/_helpers.tpl

@@ -207,6 +207,17 @@ Get core-connector full-qualified domain.
 {{.Values.fqdn.coreConnectorSubdomain}}.{{.Values.fqdn.domain}}
 {{- end -}}
 
+{{/*
+TCP port for connection.
+*/}}
+{{- define "ztka.tcpPort" -}}
+  {{- $tcpPort := 443 -}}
+  {{- if and  $.Values.contour.envoy.hostPorts .Values.contour.envoy.hostPorts.https -}}
+    {{- $tcpPort = .Values.contour.envoy.hostPorts.https -}}
+  {{- end -}}
+{{ $tcpPort }}
+{{- end -}}
+
 {{/*
 Get user full-qualified domain.
 */}}

charts/ztka/templates/configmap-paralus.yaml

@@ -18,6 +18,6 @@ data:
   RELAY_IMAGE: {{ .Values.images.relay.repository }}:{{ .Values.images.relay.tag | default .Chart.AppVersion }}
   SCHEDULER_NAMESPACE: {{ .Release.Namespace | quote }}
   SENTRY_PEERING_HOST: "paralus:10001"
-  CORE_RELAY_CONNECTOR_HOST: {{ printf "%s:%s" (include "ztka.coreConnectorFQDN" .) "443" | quote }}
-  CORE_RELAY_USER_HOST: {{ printf "%s:%s" (include "ztka.userFQDN" .) "443" | quote }}
+  CORE_RELAY_CONNECTOR_HOST: {{ printf "%s:%s" (include "ztka.coreConnectorFQDN" .) (include "ztka.tcpPort" .) | quote }}
+  CORE_RELAY_USER_HOST: {{ printf "%s:%s" (include "ztka.userFQDN" .) (include "ztka.tcpPort" .) | quote }}
   SENTRY_BOOTSTRAP_ADDR: {{ include "ztka.consoleFQDNWithPort" . | quote }}

charts/ztka/values.yaml

@@ -591,6 +591,14 @@ contour:
       create: false
 
   envoy:
+    # -- Envoy host ports.
+    hostPorts:
+      http: 80
+      https: 443
+
     service:
       # -- Annotations for Envoy service.
       annotations: {}
+
+      # -- Type of Envoy service to create.
+      type: LoadBalancer