ee8b278 · typeable/octopod

git.iko.soy/typeable/octopod

on master help sign in

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

ee8b278Alex-Sizov5 years ago

charts/helm3/octopod/Chart.yaml+1−1

@@ -2,7 +2,7 @@ apiVersion: v2

2name: octopod

3description: An opensource self-hosted solution for managing multiple deployments in a Kubernetes cluster.

4type: application

5−version: 0.3.1

5+version: 0.3.2

6appVersion: 1.2.1

7keywords:

8 - kubernetes

charts/helm3/octopod/templates/nginx-configmap.yaml+3−2

@@ -13,6 +13,7 @@ data:

13 root /www;

14 index index.html;

15 error_page 404 =200 /index.html;

16+ charset utf-8;

16 gzip on;

17 gzip on;

17 gzip_disable msie6;

18 gzip_disable msie6;

18 gzip_buffers 32 4k;

19 gzip_buffers 32 4k;

@@ -21,8 +22,8 @@ data:

21 }

22 }

22 config.json: |

23 config.json: |

23 {

24 {

24− "app_url": "{{ printf "%s://%s" (include "httpScheme" .) .Values.ingress.app.host}}",

25+ "app_url": "{{ printf "%s://%s" (include "httpScheme" .) (include "appIngressHost" . )}}",

25− "ws_url": "{{ printf "%s://%s" (include "wsScheme" .) .Values.ingress.ws.host}}",

26+ "ws_url": "{{ printf "%s://%s" (include "wsScheme" .) (include "wsIngressHost" .) }}",

26 "app_auth": "Basic {{ printf "octopod:%s" $octopodAppAuthPassword | b64enc }}",

27 "app_auth": "Basic {{ printf "octopod:%s" $octopodAppAuthPassword | b64enc }}",

27 {{- if .Values.kubernetesDashboard.enabled }}

28 {{- if .Values.kubernetesDashboard.enabled }}

28 "kubernetes_dashboard_url_template": "{{ .Values.kubernetesDashboard.url }}/#/search?namespace={{ .Values.octopod.deploymentNamespace }}&q="

29 "kubernetes_dashboard_url_template": "{{ .Values.kubernetesDashboard.url }}/#/search?namespace={{ .Values.octopod.deploymentNamespace }}&q="