Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f8bd5c2

Browse files
Merge pull request #811 from voriol/fix-helm-chart-issue-810
fixes #810 
2 parents d74b8da + 8c7b43b commit f8bd5c2

File tree

9 files changed

+22
-16
lines changed

9 files changed

+22
-16
lines changed

‎deploy/helm/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ appVersion: "latest"
1313
dependencies:
1414
- condition: redis.enabled
1515
name: redis
16-
repository: https://charts.bitnami.com/bitnami
17-
version: 17.0.10
16+
repository: oci://registry-1.docker.io/bitnamicharts
17+
version: 19.1.0
1818
- condition: mongodb.enabled
1919
name: mongodb
20-
repository: https://charts.bitnami.com/bitnami
21-
version: 13.6.2
20+
repository: oci://registry-1.docker.io/bitnamicharts
21+
version: 15.1.4
2222

‎deploy/helm/templates/_helpers.tpl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
6262
Selector labels
6363
*/}}
6464
{{- define "lowcoder.selectorLabels" -}}
65-
app.kubernetes.io/name: {{ include "lowcoder.name" . }}
65+
{{- $name := include "lowcoder.name" . -}}
66+
{{- $componentName := .component | default "" -}}
67+
{{- if ne $componentName "" -}}
68+
app.kubernetes.io/name: {{ $name }}-{{ $componentName }}
69+
{{- else -}}
70+
app.kubernetes.io/name: {{ $name }}
71+
{{- end }}
6672
app.kubernetes.io/instance: {{ .Release.Name }}
6773
{{- end }}
6874

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels" . | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels" . | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
selector:
20-
{{- include "lowcoder.selectorLabels" . | nindent 4 }}
20+
{{- include "lowcoder.selectorLabels" (dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

‎deploy/helm/templates/frontend/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels" . | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels" . | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

‎deploy/helm/templates/frontend/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
selector:
20-
{{- include "lowcoder.selectorLabels" . | nindent 4 }}
20+
{{- include "lowcoder.selectorLabels" (dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels" . | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels" . | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
selector:
20-
{{- include "lowcoder.selectorLabels" . | nindent 4 }}
20+
{{- include "lowcoder.selectorLabels" (dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

‎deploy/helm/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ frontend:
136136
#tag: "latest"
137137

138138
service:
139-
type: NodePort
139+
type: ClusterIP
140140
port: 80
141-
nodePort: 30099
141+
#nodePort: 30099
142142

143143
replicaCount: 1
144144
autoscaling:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /