You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by jo...@apache.org on 2024/04/25 06:42:58 UTC
(incubator-devlake-helm-chart) branch main updated: fix: use pathType ImplementationSpecific for regex (#272)
This is an automated email from the ASF dual-hosted git repository.
jorgegarag 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 392dc80 fix: use pathType ImplementationSpecific for regex (#272)
392dc80 is described below
commit 392dc80e2e79a39fda175563e3d4c983d865aa14
Author: Guilhem Lettron <gu...@barpilot.io>
AuthorDate: Thu Apr 25 08:42:54 2024 +0200
fix: use pathType ImplementationSpecific for regex (#272)
* fix: use pathType ImplementationSpecific for regex
fix error
```
path /(/?|$)(.*) cannot be used with pathType Prefix
```
Signed-off-by: Guilhem Lettron <gu...@barpilot.io>
* chore: split grafana and root specifix ingress
This simplify template and overriding.
---------
Signed-off-by: Guilhem Lettron <gu...@barpilot.io>
---
charts/devlake/templates/ingresses.yaml | 57 ++++++++++++---------------------
1 file changed, 21 insertions(+), 36 deletions(-)
diff --git a/charts/devlake/templates/ingresses.yaml b/charts/devlake/templates/ingresses.yaml
index 72b08aa..cab10bf 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 }}
@@ -56,31 +53,7 @@ spec:
- host: {{ .Values.ingress.hostname | quote }}
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 }}
- backend:
- {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
- service:
- name: {{ .Values.grafana.ingressServiceName | default ( include "grafana.fullname" (dict "Values" .Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) ) }}
- port:
- number: {{ .Values.grafana.ingressServicePort | default .Values.grafana.service.port }}
- {{- else }}
- serviceName: {{ .Values.grafana.ingressServiceName | default ( include "grafana.fullname" (dict "Values" .Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) ) }}
- 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 }}
@@ -97,7 +70,6 @@ spec:
{{- if .Values.ingress.extraPaths }}
{{- toYaml .Values.ingress.extraPaths | nindent 10 }}
{{- end }}
-{{- if and .Values.ingress.useDefaultNginx (not .Values.grafana.enabled) }}
---
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
@@ -108,12 +80,17 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
- name: {{ $fullName }}-ext-grafana
+ name: {{ $fullName }}-grafana
labels:
{{- include "devlake.labels" . | nindent 4 }}
annotations:
+ {{- if .Values.ingress.useDefaultNginx }}
+ nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
+ {{- end}}
+ {{- if not .Values.ingress.enabled }}
nginx.ingress.kubernetes.io/permanent-redirect: {{ .Values.grafana.external.url }}
+ {{- end }}
{{- with .Values.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
@@ -131,19 +108,27 @@ spec:
- host: {{ .Values.ingress.hostname | quote }}
http:
paths:
+ {{- if .Values.ingress.useDefaultNginx }}
- path: /{{ include "devlake.grafanaEndpointPrefix" . }}(/|$)(.*)
+ {{- else }}
+ - path: /{{ include "devlake.grafanaEndpointPrefix" . }}
+ {{- end }}
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+ {{- if .Values.ingress.useDefaultNginx }}
+ pathType: ImplementationSpecific
+ {{- else }}
pathType: Prefix
{{- end }}
- backend: # dummy to config-ui, actual 302 forearding for external grafana
+ {{- end }}
+ # dummy in case of external grafana (redirect 308)
+ backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ $uiServiceName }}
+ name: {{ .Values.grafana.ingressServiceName | default ( include "grafana.fullname" (dict "Values" .Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) ) }}
port:
- number: 4000
+ number: {{ .Values.grafana.ingressServicePort | default .Values.grafana.service.port }}
{{- else }}
- serviceName: {{ $uiServiceName }}
- servicePort: 4000
+ serviceName: {{ .Values.grafana.ingressServiceName | default ( include "grafana.fullname" (dict "Values" .Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) ) }}
+ servicePort: {{ .Values.grafana.ingressServicePort | default .Values.grafana.service.port }}
{{- end }}
-{{- end }}
-{{- end }}
+{{- end -}}