fix tpl

Author: mikhail-klimko

charts/internal-gateway/files/conf.d/s3-gateway.conf

@@ -1,6 +1,8 @@
-{{- $vals := include "internal-gateway.default-values" . | fromYaml }}
+{{- $vals := include "internal-gateway.default-values" . | fromYaml -}}
+{{- $mergedValues := mergeOverwrite $vals .Values -}}
+{{- $_ := set . "Values" $mergedValues -}}
 server {
-    listen {{ index . "codefresh" "workflow-logs-s3-proxy-domain" }}:80;
+    listen {{ index $vals "codefresh" "serviceEndpoints" "workflow-logs-s3-proxy" "domain" }}:80;
 
     js_import auth.js;
     location ~ /(.+) {

charts/internal-gateway/templates/_default_values.tpl

@@ -59,6 +59,7 @@ codefresh:
       svc: '{{ .Release.Name }}-{{ index .Values.codefresh "jira-addon-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
       port: {{ index .Values.codefresh "jira-addon-port" }}
     workflow-logs-s3-proxy:
+      domain: logs.codefresh.io
       svc: '{{ .Release.Name }}-{{ index .Values.codefresh "workflow-logs-s3-proxy-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
       port: {{ index .Values.codefresh "workflow-logs-s3-proxy-port" }}
 {{- end }}

charts/internal-gateway/templates/extra-configs.yaml

@@ -7,7 +7,7 @@ data:
   {{- $rootContext := $ }}
   {{- range $globPattern := $rootContext.Values.nginx.extraConfigsPatterns }}
     {{- range $path, $_ := $rootContext.Files.Glob $globPattern }}
-  {{ base $path }}: {{ tpl ($rootContext.Files.Get $path) $rootContext.Values | toYaml | nindent 4 }}
+  {{ base $path }}: {{ tpl ($rootContext.Files.Get $path) $rootContext | toYaml | nindent 4 }}
     {{- end }}
   {{- end }}
 {{- end }}