You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2023/04/23 09:28:17 UTC
[incubator-devlake-helm-chart] branch kw-5009-external-grafana created (now 1c57a2d)
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a change to branch kw-5009-external-grafana
in repository https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git
at 1c57a2d refactor: adopt USE_EXTERNAL_GRAFANA instead of mounting `default.conf.tpl`
This branch includes the following new commits:
new 1c57a2d refactor: adopt USE_EXTERNAL_GRAFANA instead of mounting `default.conf.tpl`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-devlake-helm-chart] 01/01: refactor: adopt USE_EXTERNAL_GRAFANA instead of mounting `default.conf.tpl`
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch kw-5009-external-grafana
in repository https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git
commit 1c57a2dba40a98ba0f7e86d9981bb0d3c1d2bcbf
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Sun Apr 23 16:29:26 2023 +0800
refactor: adopt USE_EXTERNAL_GRAFANA instead of mounting `default.conf.tpl`
---
charts/devlake/templates/configmaps.yaml | 45 -------------------------------
charts/devlake/templates/deployments.yaml | 2 ++
2 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/charts/devlake/templates/configmaps.yaml b/charts/devlake/templates/configmaps.yaml
index 1138835..a5a8776 100644
--- a/charts/devlake/templates/configmaps.yaml
+++ b/charts/devlake/templates/configmaps.yaml
@@ -37,51 +37,6 @@ data:
ADMIN_PASS: "{{ .Values.ui.basicAuth.password }}"
{{- end }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "devlake.fullname" . }}-nginx-conf
-data:
- default.conf.tpl: |
- server {
- listen 4000;
- server_name localhost;
- ${SERVER_CONF}
-
- location / {
- root /usr/share/nginx/html;
- index index.html;
- try_files $uri /index.html;
- }
-
- location /api/ {
- resolver ${DNS} valid=${DNS_VALID};
- resolver_timeout 3s;
- set $target "${DEVLAKE_ENDPOINT}";
- rewrite /api/(.*) /$1 break;
- proxy_send_timeout 10s;
- proxy_read_timeout 10s;
- proxy_pass http://$target;
- }
-{{- if .Values.grafana.useExternal }}
- location /grafana/ {
- return 302 ${GRAFANA_ENDPOINT};
- }
-{{- else }}
- location /grafana/ {
- resolver ${DNS} valid=${DNS_VALID};
- resolver_timeout 3s;
- set $target "${GRAFANA_ENDPOINT}";
- rewrite /grafana/(.*) /$1 break;
- proxy_set_header Authorization "";
- proxy_send_timeout 10s;
- proxy_read_timeout 10s;
- proxy_pass http://$target;
- }
-{{- end }}
- }
-
---
{{- if not .Values.grafana.useExternal }}
apiVersion: v1
diff --git a/charts/devlake/templates/deployments.yaml b/charts/devlake/templates/deployments.yaml
index e1b3616..9f8a6db 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -128,6 +128,8 @@ spec:
{{- if .Values.grafana.useExternal }}
- name: GRAFANA_ENDPOINT
value: {{ .Values.grafana.externalUrl }}
+ - name: USE_EXTERNAL_GRAFANA
+ value: "true"
{{- else }}
- name: GRAFANA_ENDPOINT
value: {{ include "devlake.fullname" . }}-grafana.{{ .Release.Namespace }}.svc.cluster.local:3000