Commit ef767c02 authored by sonicaj's avatar sonicaj

Correctly set server_name so that it doesn't include the node port

parent fbb2fe07
...@@ -13,7 +13,7 @@ portals: ...@@ -13,7 +13,7 @@ portals:
protocols: protocols:
- "https" - "https"
host: host:
- "$variable-server_name" - "$variable-config.server_name"
ports: ports:
- "$variable-nodePort" - "$variable-nodePort"
path: "/loleaflet/dist/admin/admin.html" path: "/loleaflet/dist/admin/admin.html"
......
...@@ -57,7 +57,7 @@ spec: ...@@ -57,7 +57,7 @@ spec:
{{ $envList = mustAppend $envList (dict "name" "cert_domain" "value" "192.168.0.3") }} {{ $envList = mustAppend $envList (dict "name" "cert_domain" "value" "192.168.0.3") }}
{{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }} {{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }}
{{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" $envConfig.DONT_GEN_SSL_CERT) }} {{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" $envConfig.DONT_GEN_SSL_CERT) }}
{{ $envList = mustAppend $envList (dict "name" "server_name" "value" $envConfig.server_name) }} {{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v:%v" $envConfig.server_name .Values.nodePort)) }}
{{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }} {{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }}
{{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }} {{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }}
{{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }} {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment