diff --git a/helm/templates/mapproxinator/mapproxinator-container.yaml b/helm/templates/mapproxinator/mapproxinator-container.yaml index b034995..54ddd47 100644 --- a/helm/templates/mapproxinator/mapproxinator-container.yaml +++ b/helm/templates/mapproxinator/mapproxinator-container.yaml @@ -2,15 +2,16 @@ {{- $mapproxinatorConfigmapName := include "mapproxinator-configmap.fullname" . -}} {{- $db := (include "common.db.merged" .) | fromYaml }} {{- $storage := (include "common.storage.merged" .) | fromYaml }} +{{- $caCertPath := printf "%s/%s" .Values.global.ca.path .Values.global.ca.key }} - name: mapproxinator image: {{ .cloudProviderDockerRegistryUrl }}{{ .Values.mapproxinator.image.repository }}:{{ .Values.mapproxinator.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: {{- if .Values.global.ca.secretName }} - name: REQUESTS_CA_BUNDLE - value: {{ printf "%s/%s" .Values.global.ca.path .Values.global.ca.key | quote }} + value: {{ $caCertPath | quote }} - name: NODE_EXTRA_CA_CERTS - value: {{ printf "%s/%s" .Values.global.ca.path .Values.global.ca.key | quote }} + value: {{ $caCertPath | quote }} {{- end }} - name: INIT_MODE value: "false" diff --git a/helm/templates/mapproxy/mapproxy-container.yaml b/helm/templates/mapproxy/mapproxy-container.yaml index ad14793..83069e3 100644 --- a/helm/templates/mapproxy/mapproxy-container.yaml +++ b/helm/templates/mapproxy/mapproxy-container.yaml @@ -3,6 +3,7 @@ {{- $storage := (include "common.storage.merged" .) | fromYaml }} {{- $fs := (include "common.fs.merged" .) | fromYaml }} {{- $metrics := (include "common.metrics.merged" .) | fromYaml }} +{{- $caCertPath := printf "%s/%s" .Values.global.ca.path .Values.global.ca.key }} - name: mapproxy image: {{ .cloudProviderDockerRegistryUrl }}{{ .Values.mapproxy.image.repository }}:{{ .Values.mapproxy.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} @@ -17,9 +18,11 @@ value: {{ .Values.mapproxy.redis.healthCheckInterval | quote }} {{- if .Values.global.ca.secretName }} - name: REQUESTS_CA_BUNDLE - value: {{ printf "%s/%s" .Values.global.ca.path .Values.global.ca.key | quote }} + value: {{ $caCertPath | quote }} - name: NODE_EXTRA_CA_CERTS - value: {{ printf "%s/%s" .Values.global.ca.path .Values.global.ca.key | quote }} + value: {{ $caCertPath | quote }} + - name: SSL_CERT_FILE + value: {{ $caCertPath | quote }} {{- end }} {{- if eq (upper $storage.tilesStorageProvider) "S3" }} - name: AWS_ACCESS_KEY_ID