Skip to content

fixes #810 #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2024
Merged

fixes #810 #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deploy/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

8 changes: 7 additions & 1 deletion deploy/helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/templates/api-service/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/api-service/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions deploy/helm/templates/frontend/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/frontend/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions deploy/helm/templates/node-service/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/node-service/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions deploy/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ frontend:
#tag: "latest"

service:
type: NodePort
type: ClusterIP
port: 80
nodePort: 30099
#nodePort: 30099

replicaCount: 1
autoscaling:
Expand Down