avoid possible index error

Author: monrax

graylog/templates/_helpers.tpl

@@ -304,12 +304,20 @@ Graylog External URI
 {{- if and .Values.graylog.config.tls.enabled .Values.graylog.config.tls.cn }}
   {{- $externalHost = .Values.graylog.config.tls.cn }}
   {{- $scheme = "https" }}
-{{- else if len .Values.ingress.web.tls | lt 0 | and .Values.ingress.web.enabled }}
-  {{- $externalHost = index (index .Values.ingress.web.tls 0).hosts 0 }}
+{{- else if and .Values.ingress.enabled .Values.ingress.web.enabled .Values.ingress.web.tls }}
+  {{- with .Values.ingress.web.tls }}
+    {{- with (index . 0).hosts }}
+        {{- $externalHost = index . 0 | default "" }}
+    {{- end }}
+  {{- end }}
   {{- $scheme = "https" }}
   {{- $port = "" }}
-{{- else if len .Values.ingress.web.hosts | lt 0 | and .Values.ingress.web.enabled }}
-  {{- $externalHost = (index .Values.ingress.web.hosts 0).host }}
+{{- else if and .Values.ingress.enabled .Values.ingress.web.enabled .Values.ingress.web.hosts }}
+  {{- with .Values.ingress.web.hosts }}
+    {{- with (index . 0) }}
+        {{- $externalHost = .host | default "" }}
+    {{- end }}
+  {{- end }}
   {{- $port = "" }}
 {{- else if eq .Values.graylog.custom.service.type "LoadBalancer" | and $svc $svc.status.loadBalancer }}
   {{- $lbName := index $svc.status.loadBalancer.ingress 0 }}

graylog/templates/config/graylog.yaml

@@ -46,9 +46,8 @@ data:
   GRAYLOG_HTTP_ENABLE_TLS: {{ .Values.graylog.config.tls.enabled | quote }}
   GRAYLOG_HTTP_TLS_CERT_FILE: "/usr/share/graylog/tls/tls.crt"
   GRAYLOG_HTTP_TLS_KEY_FILE: "/usr/share/graylog/tls/tls.key"
-  {{- $externalUri := include "graylog.externalUri" . }}
-  {{- if $externalUri }}
-  GRAYLOG_HTTP_EXTERNAL_URI: {{ $externalUri | quote }}
+  {{- with (include "graylog.externalUri" .) }}
+  GRAYLOG_HTTP_EXTERNAL_URI: {{ . | quote }}
   {{- end -}}
   {{/* http_publish_uri is rendered directly on the PodSpec for each Graylog node based on $POD_NAME */}}
   # GRAYLOG_HTTP_PUBLISH_URI: ""