You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2024/04/25 10:03:19 UTC
(incubator-devlake-helm-chart) branch main updated: fix ingress issue (#278)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git
The following commit(s) were added to refs/heads/main by this push:
new 856f065 fix ingress issue (#278)
856f065 is described below
commit 856f0654c7390bec024a81d43ca71f535c301243
Author: ZhangNing10 <13...@users.noreply.github.com>
AuthorDate: Thu Apr 25 18:03:14 2024 +0800
fix ingress issue (#278)
* fix ingress issue
* disable usedefaultnginx
* adjust ingress pathtype of external grafana
* adjust annotation for external grafana ingress
---
charts/devlake/templates/ingresses.yaml | 14 ++------------
charts/devlake/values.yaml | 5 ++---
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/charts/devlake/templates/ingresses.yaml b/charts/devlake/templates/ingresses.yaml
index 72b08aa..568b56c 100644
--- a/charts/devlake/templates/ingresses.yaml
+++ b/charts/devlake/templates/ingresses.yaml
@@ -36,9 +36,6 @@ metadata:
labels:
{{- include "devlake.labels" . | nindent 4 }}
annotations:
- {{- if .Values.ingress.useDefaultNginx }}
- nginx.ingress.kubernetes.io/rewrite-target: /$2
- {{- end}}
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
@@ -57,11 +54,7 @@ spec:
http:
paths:
{{- if .Values.grafana.enabled }}
- {{- if .Values.ingress.useDefaultNginx }}
- - path: /{{ include "devlake.grafanaEndpointPrefix" . }}(/|$)(.*)
- {{- else }}
- path: /{{ include "devlake.grafanaEndpointPrefix" . }}
- {{- end }}
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
@@ -76,11 +69,7 @@ spec:
servicePort: {{ .Values.grafana.ingressServicePort | default .Values.grafana.service.port }}
{{- end }}
{{- end }}
- {{- if .Values.ingress.useDefaultNginx }}
- - path: /{{ include "devlake.uiEndpointPrefix" . }}(/?|$)(.*)
- {{- else }}
- path: /{{ include "devlake.uiEndpointPrefix" . }}
- {{- end}}
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
@@ -112,6 +101,7 @@ metadata:
labels:
{{- include "devlake.labels" . | nindent 4 }}
annotations:
+ nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/permanent-redirect: {{ .Values.grafana.external.url }}
{{- with .Values.ingress.annotations }}
@@ -133,7 +123,7 @@ spec:
paths:
- path: /{{ include "devlake.grafanaEndpointPrefix" . }}(/|$)(.*)
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
- pathType: Prefix
+ pathType: ImplementationSpecific
{{- end }}
backend: # dummy to config-ui, actual 302 forearding for external grafana
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index 8af2ec8..4708b17 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -152,8 +152,7 @@ grafana:
repository: devlake.docker.scarf.sh/apache/devlake-dashboard
tag: v1.0.0-beta5
deploymentStrategy:
- rollingUpdate:
- maxUnavailable: 1
+ type: Recreate
adminPassword: ""
grafana.ini:
server:
@@ -332,7 +331,7 @@ ingress:
enabled: false
enableHttps: false
# Set to false if you want to use a different ingress controller
- useDefaultNginx: true
+ useDefaultNginx: false
# ingress class name, example: alb for AWS load balancer controller
className:
# domain name for hosting devlake, must be set if ingress is enabled