This is an automated email from the ASF dual-hosted git repository.
klesh 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 8a5a31c adjust config ui probes (#256)
8a5a31c is described below
commit 8a5a31c7f5f7f1d740eb59ecf8d8107428d0517e
Author: ZhangNing10 <[email protected]>
AuthorDate: Mon Feb 26 09:05:06 2024 +0800
adjust config ui probes (#256)
---
charts/devlake/templates/_helpers.tpl | 11 -----------
charts/devlake/templates/deployments.yaml | 10 +---------
charts/devlake/values.yaml | 4 ++--
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/charts/devlake/templates/_helpers.tpl
b/charts/devlake/templates/_helpers.tpl
index 8481574..3f5911e 100644
--- a/charts/devlake/templates/_helpers.tpl
+++ b/charts/devlake/templates/_helpers.tpl
@@ -112,17 +112,6 @@ The ui endpoint
{{- end -}}
{{- end -}}
-{{- define "devlake.ui.auth.probe" -}}
-{{- with .Values.ui.basicAuth }}
- {{- if .enabled -}}
-name: Authorization
-value: {{ printf "Basic %s" (printf "%s:%s" .user .password | b64enc) | quote
}}
- {{- else -}}
-[]
- {{- end }}
-{{- end }}
-{{- end }}
-
{{- define "devlake.lake.encryption.secret" -}}
{{- if .Values.lake.encryptionSecret.secretName -}}
{{- .Values.lake.encryptionSecret.secretName -}}
diff --git a/charts/devlake/templates/deployments.yaml
b/charts/devlake/templates/deployments.yaml
index cfffed1..197476c 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -64,23 +64,15 @@ spec:
imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
ports:
- containerPort: 4000
- {{- $httpAuthProbe := (include "devlake.ui.auth.probe" $ | fromYaml
| list) }}
- {{- $basicAuth := .Values.ui.basicAuth.enabled }}
{{- with .Values.ui.livenessProbe }}
livenessProbe:
- {{- if and ($basicAuth) (not (hasKey .httpGet "httpHeaders")) }}
- {{- $_ := set .httpGet "httpHeaders" ($httpAuthProbe) }}
- {{- end }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.ui.readinessProbe }}
readinessProbe:
- {{- if and ($basicAuth) (not (hasKey .httpGet "httpHeaders")) }}
- {{- $_ := set .httpGet "httpHeaders" ($httpAuthProbe) }}
- {{- end }}
{{- toYaml . | nindent 12 }}
{{- end }}
- {{- if $basicAuth }}
+ {{- if .Values.ui.basicAuth.enabled }}
envFrom:
- secretRef:
name: {{ include "devlake.ui.auth.secret" . }}
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index 0b80e21..d9824d1 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -259,7 +259,7 @@ ui:
livenessProbe:
httpGet:
- path: /
+ path: /health/
port: 4000
scheme: HTTP
failureThreshold: 5
@@ -270,7 +270,7 @@ ui:
readinessProbe:
httpGet:
- path: /
+ path: /health/
port: 4000
scheme: HTTP
failureThreshold: 3
