Merge pull request #811 from voriol/fix-helm-chart-issue-810

fixes #810

Author: FalkWolsky

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
 

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 }}
 

deploy/helm/templates/api-service/deployment.yaml

@@ -10,15 +10,15 @@ 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 }}
       annotations:
         {{- 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:

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 }}

deploy/helm/templates/frontend/deployment.yaml

@@ -10,15 +10,15 @@ 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 }}
       annotations:
         {{- 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:

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 }}

deploy/helm/templates/node-service/deployment.yaml

@@ -10,15 +10,15 @@ 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 }}
       annotations:
         {{- 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:

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 }}

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: