From 8ad4d32f9bd305eaaf139b6914c9a29f83c72a37 Mon Sep 17 00:00:00 2001 From: Koen de Laat Date: Fri, 10 Nov 2023 12:09:01 +0100 Subject: [PATCH 1/3] Fix containerSecurityContext indent for initContainers --- charts/devlake/templates/deployments.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/devlake/templates/deployments.yaml b/charts/devlake/templates/deployments.yaml index 02390e8..c483a9b 100644 --- a/charts/devlake/templates/deployments.yaml +++ b/charts/devlake/templates/deployments.yaml @@ -121,8 +121,8 @@ spec: initContainers: {{- include "common.initContainerWaitDatabase" . | nindent 8 }} {{- with .Values.lake.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 12 }} + securityContext: + {{- toYaml . | nindent 12 }} {{- end }} containers: - name: lake From cd47a62218aa4e99a117d81189822fd6d511cd0c Mon Sep 17 00:00:00 2001 From: Koen de Laat Date: Fri, 10 Nov 2023 12:38:15 +0100 Subject: [PATCH 2/3] Fix Grafana service port --- charts/devlake/templates/ingresses.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/devlake/templates/ingresses.yaml b/charts/devlake/templates/ingresses.yaml index b27ec20..eb1c53d 100644 --- a/charts/devlake/templates/ingresses.yaml +++ b/charts/devlake/templates/ingresses.yaml @@ -69,10 +69,10 @@ spec: service: name: {{ include "devlake.fullname" . }}-grafana port: - number: 3000 + number: {{ .Values.grafana.service.port }} {{- else }} serviceName: {{ include "devlake.fullname" . }}-grafana - servicePort: 3000 + servicePort: {{ .Values.grafana.service.port }} {{- end }} {{- end }} {{- if .Values.ingress.useDefaultNginx }} From 5c200b36fdb3b1b5c81759033eabbf8f2473bfcc Mon Sep 17 00:00:00 2001 From: Koen de Laat Date: Fri, 10 Nov 2023 12:47:00 +0100 Subject: [PATCH 3/3] Fix Grafana service name --- charts/devlake/templates/ingresses.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/devlake/templates/ingresses.yaml b/charts/devlake/templates/ingresses.yaml index eb1c53d..5a82ea4 100644 --- a/charts/devlake/templates/ingresses.yaml +++ b/charts/devlake/templates/ingresses.yaml @@ -67,11 +67,11 @@ 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: {{ .Values.grafana.service.port }} {{- else }} - serviceName: {{ include "devlake.fullname" . }}-grafana + serviceName: {{ include "grafana.fullname" (dict "Values" .Values.grafana "Chart" (dict "Name" "grafana") "Release" .Release ) }} servicePort: {{ .Values.grafana.service.port }} {{- end }} {{- end }}