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 56dd5a5 fix: Grafana ingress and containerSecurity (#199)
56dd5a5 is described below
commit 56dd5a56c43fc33dd5194ea311c95adc35a8aba8
Author: Koen de Laat <[email protected]>
AuthorDate: Mon Nov 13 13:39:48 2023 +0100
fix: Grafana ingress and containerSecurity (#199)
* Fix containerSecurityContext indent for initContainers
* Fix Grafana service port
* Fix Grafana service name
---
charts/devlake/templates/deployments.yaml | 4 ++--
charts/devlake/templates/ingresses.yaml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/charts/devlake/templates/deployments.yaml
b/charts/devlake/templates/deployments.yaml
index 62053e2..d6d6b31 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -125,8 +125,8 @@ spec:
initContainers:
{{- include "common.initContainerWaitDatabase" . | nindent 8 }}
{{- with .Values.lake.containerSecurityContext }}
- securityContext:
- {{- toYaml . | nindent 12 }}
+ securityContext:
+ {{- toYaml . | nindent 12 }}
{{- end }}
containers:
- name: lake
diff --git a/charts/devlake/templates/ingresses.yaml
b/charts/devlake/templates/ingresses.yaml
index b27ec20..5a82ea4 100644
--- a/charts/devlake/templates/ingresses.yaml
+++ b/charts/devlake/templates/ingresses.yaml
@@ -67,12 +67,12 @@ spec:
backend:
{{- if semverCompare ">=1.19-0"
$.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ include "devlake.fullname" . }}-grafana
+ name: {{ include "grafana.fullname" (dict "Values"
.Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) }}
port:
- number: 3000
+ number: {{ .Values.grafana.service.port }}
{{- else }}
- serviceName: {{ include "devlake.fullname" . }}-grafana
- servicePort: 3000
+ serviceName: {{ include "grafana.fullname" (dict "Values"
.Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) }}
+ servicePort: {{ .Values.grafana.service.port }}
{{- end }}
{{- end }}
{{- if .Values.ingress.useDefaultNginx }}
