merge location directives (#48)

Author: mikhail-klimko

charts/internal-gateway/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.0
 description: A Helm chart for Codefresh Internal Gateway
 name: internal-gateway
-version: 0.2.1
+version: 0.2.2
 home: https://github.com/codefresh-io/helm-charts
 keywords:
   - codefresh

charts/internal-gateway/README.md

@@ -1,6 +1,6 @@
 # internal-gateway
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
 
 A Helm chart for Codefresh Internal Gateway
 

charts/internal-gateway/templates/_location_map.tpl

@@ -90,6 +90,7 @@ serviceEndpoints:
 {{- define "internal-gateway.nginx-config-defaults"}}
   {{- $endpoints := include "internal-gateway.platform-endpoints" . | fromYaml }}
   {{- $presets := include "internal-gateway.location-presets" . | fromYaml }}
+  {{- $_  := set $presets "locationDirectives" (mergeOverwrite $presets.locationDirectives .Values.nginx.config.locationDirectives) }}
 nginx:
   config:
     workerProcesses: "8"