ee8b278 · typeable/octopod

git.iko.soy/typeable/octopod

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

commitee8b278ce1713c8318de134a442b5d73d5267311 authorAlex-Sizov <45825279+Alex-Sizov@users.noreply.github.com> dateMon 19 Jul 2021, 19:34 (5 years ago) parent9a87bbd

2 files changed+4−3

compare with master

unifiedsplit

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

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

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

22name: octopod

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

44type: application

5−version: 0.3.1

5+version: 0.3.2

66appVersion: 1.2.1

77keywords:

88 - kubernetes

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

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

1313 root /www;

1414 index index.html;

1515 error_page 404 =200 /index.html;

16+ charset utf-8;

1617 gzip on;

1718 gzip_disable msie6;

1819 gzip_buffers 32 4k;

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

2122 }

2223 config.json: |

2324 {

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

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

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

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

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

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

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