Add Ingress trailing / rewrite (#897)

vmware-tanzu · Dec 28, 2018 · 07749fa · 07749fa
1 parent d8e818d
commit 07749fa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/chart/kubeapps/templates/_helpers.tpl b/chart/kubeapps/templates/_helpers.tpl
@@ -131,3 +131,16 @@ Create name for the tiller-proxy based on the fullname
 {{- define "kubeapps.tiller-proxy.fullname" -}}
 {{ template "kubeapps.fullname" . }}-internal-tiller-proxy
 {{- end -}}
+
+{{/*
+Nginx rewrite rules that will add trailing slash to the provided custom ingress paths
+Trailing / is required for the react app to work
+*/}}
+{{- define "kubeapps.ingressRewrites" -}}
+{{ range .Values.ingress.hosts -}}
+{{- if ne .path "/" -}}
+      rewrite ^({{ .path }})$ $1/ permanent;
+{{- end -}}
+{{- end }}
+{{- end -}}
+
diff --git a/chart/kubeapps/templates/ingress.yaml b/chart/kubeapps/templates/ingress.yaml
@@ -9,6 +9,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- $rewrites := include "kubeapps.ingressRewrites" . -}}
+    {{- if ne $rewrites ""}}
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      {{ template "kubeapps.ingressRewrites" $ }}
+    {{- end -}}
     {{- if .Values.ingress.certManager }}
     kubernetes.io/tls-acme: "true"
     {{- end }}