fix config.json template, add charset to nginx config (#52)

typeable · Jul 28, 2021 · ee8b278 · ee8b278
1 parent 9a87bbd
commit ee8b278
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/charts/helm3/octopod/Chart.yaml b/charts/helm3/octopod/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: octopod
 description: An opensource self-hosted solution for managing multiple deployments in a Kubernetes cluster.
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: 1.2.1
 keywords:
   - kubernetes

diff --git a/charts/helm3/octopod/templates/nginx-configmap.yaml b/charts/helm3/octopod/templates/nginx-configmap.yaml
@@ -13,6 +13,7 @@ data:
       root /www;
       index index.html;
       error_page 404 =200 /index.html;
+      charset utf-8;
       gzip on;
       gzip_disable msie6;
       gzip_buffers 32 4k;
@@ -21,8 +22,8 @@ data:
     }
   config.json: |
     {
-      "app_url": "{{ printf "%s://%s" (include "httpScheme" .) .Values.ingress.app.host}}",
-      "ws_url": "{{ printf "%s://%s" (include "wsScheme" .) .Values.ingress.ws.host}}",
+      "app_url": "{{ printf "%s://%s" (include "httpScheme" .) (include "appIngressHost" . )}}",
+      "ws_url": "{{ printf "%s://%s" (include "wsScheme" .) (include "wsIngressHost" .) }}",
       "app_auth": "Basic {{ printf "octopod:%s" $octopodAppAuthPassword | b64enc }}",
       {{- if .Values.kubernetesDashboard.enabled }}
       "kubernetes_dashboard_url_template": "{{ .Values.kubernetesDashboard.url }}/#/search?namespace={{ .Values.octopod.deploymentNamespace }}&q="