fix accidently removed definition

FraunhoferIOSB · Sep 20, 2024 · 6769b39 · 6769b39
1 parent 09cd334
commit 6769b39
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/helm/frost-server/templates/NOTES.txt b/helm/frost-server/templates/NOTES.txt
@@ -34,7 +34,7 @@ FROST-Server's resource     | Access URL
 HTTP - Homepage             | {{ include "frost-server.http.serviceRootUrl" . }}
 HTTP - SensorThings API     | {{ include "frost-server.http.serviceRootUrl" . }}{{ include "frost-server.http.apiVersion" . }}
 {{- if .Values.frost.mqtt.enabled }}
-MQTT - TCP                  | {{ include "frost-server.mqtt.serviceHost" . }}
+MQTT - TCP                  | {{ include "frost-server.mqtt.serviceEndpoint" . }}
 MQTT - Websocket            | {{ include "frost-server.mqtt.serviceRootUrl" . }}
 {{- end }}
 

diff --git a/helm/frost-server/templates/_helpers.tpl b/helm/frost-server/templates/_helpers.tpl
@@ -72,9 +72,6 @@ Get the MQTT service root URL.
 {{ .Values.frost.mqtt.serviceProtocol }}://{{ template "frost-server.mqtt.serviceHost" . }}{{ if .Values.frost.mqtt.servicePort }}:{{ .Values.frost.mqtt.servicePort }}{{ else if not .Values.frost.mqtt.ingress.enabled }}:{{ .Values.frost.mqtt.ports.mqtt.nodePort }}{{ end }}{{ if .Values.frost.mqtt.ingress.enabled }}{{ template "frost-server.mqtt.websockPath" . }}{{ end }}
 {{- end -}}
 
-{{/*
-{{- end -}}
-
 {{/*
 Get the MQTT Websock-Path.
 */}}
@@ -86,6 +83,17 @@ Get the MQTT Websock-Path.
   {{- end -}}
 {{- end -}}
 
+{{/*
+Get the MQTT TCP service EndPoint
+*/}}
+{{- define "frost-server.mqtt.serviceEndpoint" -}}
+  {{- if and .Values.frost.http.serviceHost .Values.frost.mqtt.ports.mqtt.nodePort -}}
+      {{- printf "%s:%s" .Values.frost.http.serviceHost .Values.frost.mqtt.ports.mqtt.nodePort -}}
+  {{- else -}}
+      {{- printf "NOT CONFIGURED -- please set frost.mqtt.ports.mqtt.nodePort in values.yaml" -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Get the default agic rewriteAnnotations for ingress.
 */}}