Merge pull request #20 from GemeenteUtrecht/fix-nginx-deployment

Multiple fixes for Open-Zaak chart
open-zaak · Mar 2, 2022 · 84bb54e · 84bb54e
2 parents 5472d90 + 73c9f33
commit 84bb54e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/charts/open-zaak/Chart.yaml b/charts/open-zaak/Chart.yaml
@@ -3,7 +3,7 @@ name: open-zaak
 description: Productiewaardige API's voor Zaakgericht Werken
 
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: "1.5.0"
 
 dependencies:

diff --git a/charts/open-zaak/templates/configmap-nginx.yaml b/charts/open-zaak/templates/configmap-nginx.yaml
@@ -14,7 +14,7 @@ data:
     proxy_set_header X-Scheme $scheme;
     proxy_connect_timeout 300s;
     proxy_read_timeout 300s;
-    {{- if .Values.useXForwardedHost }}
+    {{- if .Values.settings.useXForwardedHost }}
     proxy_set_header Host $http_host;
     {{- end }}
 

diff --git a/charts/open-zaak/templates/configmap.yaml b/charts/open-zaak/templates/configmap.yaml
@@ -5,8 +5,8 @@ metadata:
   labels:
     {{- include "open-zaak.labels" . | nindent 4 }}
 data:
-  ALLOWED_HOSTS: "{{ include "open-zaak.fullname" . }},{{ .Values.settings.allowedHosts | toString }}"
-  {{- if .Values.useXForwardedHost }}
+  ALLOWED_HOSTS: "{{ include "open-zaak.fullname" . }},{{ include "open-zaak.fullname" . }}.{{ .Release.Namespace }},{{ .Values.settings.allowedHosts | toString }}"
+  {{- if .Values.settings.useXForwardedHost }}
   USE_X_FORWARDED_HOST: "True"
   {{- end }}
   CACHE_DEFAULT: {{ .Values.settings.cache.default | toString | quote }}

diff --git a/charts/open-zaak/values.yaml b/charts/open-zaak/values.yaml
@@ -145,7 +145,6 @@ nginx:
     readOnlyRootFilesystem: false
     runAsNonRoot: true
     runAsUser: 101
-    fsGroup: 1000
   autoscaling:
     enabled: false
   livenessProbe: