From 8c7b43b5e519c4dd5b55acb1b1217406dbbcbdad Mon Sep 17 00:00:00 2001
From: Victor Oriol <vkoriol@gmail.com>
Date: Tue, 16 Apr 2024 15:29:23 +0200
Subject: [PATCH] fixes #810

---
 deploy/helm/Chart.yaml                             | 8 ++++----
 deploy/helm/templates/_helpers.tpl                 | 8 +++++++-
 deploy/helm/templates/api-service/deployment.yaml  | 4 ++--
 deploy/helm/templates/api-service/service.yaml     | 2 +-
 deploy/helm/templates/frontend/deployment.yaml     | 4 ++--
 deploy/helm/templates/frontend/service.yaml        | 2 +-
 deploy/helm/templates/node-service/deployment.yaml | 4 ++--
 deploy/helm/templates/node-service/service.yaml    | 2 +-
 deploy/helm/values.yaml                            | 4 ++--
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 0e6538eaf..a99cee36e 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -13,10 +13,10 @@ appVersion: "latest"
 dependencies:
   - condition: redis.enabled
     name: redis
-    repository: https://charts.bitnami.com/bitnami
-    version: 17.0.10
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 19.1.0
   - condition: mongodb.enabled
     name: mongodb
-    repository: https://charts.bitnami.com/bitnami
-    version: 13.6.2
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 15.1.4
 
diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl
index 21ee16086..e13f186bc 100644
--- a/deploy/helm/templates/_helpers.tpl
+++ b/deploy/helm/templates/_helpers.tpl
@@ -62,7 +62,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "lowcoder.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "lowcoder.name" . }}
+{{- $name := include "lowcoder.name" . -}}
+{{- $componentName := .component | default "" -}}
+{{- if ne $componentName "" -}}
+app.kubernetes.io/name: {{ $name }}-{{ $componentName }}
+{{- else -}}
+app.kubernetes.io/name: {{ $name }}
+{{- end }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
diff --git a/deploy/helm/templates/api-service/deployment.yaml b/deploy/helm/templates/api-service/deployment.yaml
index 8ca560d76..af82ac079 100644
--- a/deploy/helm/templates/api-service/deployment.yaml
+++ b/deploy/helm/templates/api-service/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/deploy/helm/templates/api-service/service.yaml b/deploy/helm/templates/api-service/service.yaml
index c8bea3bdc..e3f3a0889 100644
--- a/deploy/helm/templates/api-service/service.yaml
+++ b/deploy/helm/templates/api-service/service.yaml
@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}
diff --git a/deploy/helm/templates/frontend/deployment.yaml b/deploy/helm/templates/frontend/deployment.yaml
index bbda56ec2..d91d3f623 100644
--- a/deploy/helm/templates/frontend/deployment.yaml
+++ b/deploy/helm/templates/frontend/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/deploy/helm/templates/frontend/service.yaml b/deploy/helm/templates/frontend/service.yaml
index 090087558..b787f0a3d 100644
--- a/deploy/helm/templates/frontend/service.yaml
+++ b/deploy/helm/templates/frontend/service.yaml
@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}
diff --git a/deploy/helm/templates/node-service/deployment.yaml b/deploy/helm/templates/node-service/deployment.yaml
index 3d47ef7d2..0bc4035a6 100644
--- a/deploy/helm/templates/node-service/deployment.yaml
+++ b/deploy/helm/templates/node-service/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "lowcoder.selectorLabels" . | nindent 6 }}
+      {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "lowcoder.selectorLabels" . | nindent 8 }}
+        {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/deploy/helm/templates/node-service/service.yaml b/deploy/helm/templates/node-service/service.yaml
index 756919a1f..6e7a6af95 100644
--- a/deploy/helm/templates/node-service/service.yaml
+++ b/deploy/helm/templates/node-service/service.yaml
@@ -17,4 +17,4 @@ spec:
       {{- end }}
     {{- end }}
   selector:
-    {{- include "lowcoder.selectorLabels" . | nindent 4 }}
+    {{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
index 37de9c4f3..915456bce 100644
--- a/deploy/helm/values.yaml
+++ b/deploy/helm/values.yaml
@@ -136,9 +136,9 @@ frontend:
     #tag: "latest"
 
   service:
-    type: NodePort
+    type: ClusterIP
     port: 80
-    nodePort: 30099
+    #nodePort: 30099
 
   replicaCount: 1
   autoscaling: