Skip to content

Commit dab483a

Browse files
nhuanthonhuantho
committed
[helm] Restructure helm chart of Fluss
# Conflicts: # helm/values.yaml
1 parent 96aee59 commit dab483a

File tree

10 files changed

+615
-61
lines changed

10 files changed

+615
-61
lines changed

‎.github/workflows/helm-chart.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ jobs:
4444
- name: "Checkout code"
4545
uses: actions/checkout@v6
4646

47+
- name: Set up Python
48+
uses: actions/setup-python@v5
49+
with:
50+
python-version: "3.11"
51+
52+
- name: Install dependencies
53+
run: pip install jsonschema==4.26.0
54+
55+
- name: Run unstable test reporter
56+
run: python tools/ci/helm_ci/validate_helm.py
57+
4758
- name: "Lint Helm chart"
4859
run: helm lint ./helm
4960

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,10 @@ website/versioned_docs
4545
website/versioned_sidebars
4646
website/versions.json
4747
website/pnpm-lock.yaml
48+
49+
### Python ###
50+
.venv/
51+
venv/
52+
env/
53+
.env
54+
__pycache__/

‎helm/templates/sts-coordinator.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ spec:
6262
fieldPath: status.hostIP
6363
ports:
6464
- name: internal
65-
containerPort: {{ .Values.listeners.internal.port }}
65+
containerPort: {{ .Values.ports.internal }}
6666
- name: client
67-
containerPort: {{ .Values.listeners.client.port }}
67+
containerPort: {{ .Values.ports.client }}
6868
command:
6969
- "/bin/sh"
7070
- "-c"
7171
- |
7272
export FLUSS_SERVER_ID=${POD_NAME##*-} && \
7373
cp /opt/conf/server.yaml $FLUSS_HOME/conf && \
7474
75-
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.listeners.internal.port }}, CLIENT://${POD_IP}:{{ .Values.listeners.client.port }}" && \
76-
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.coordinator-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.listeners.client.port }}" && \
75+
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.ports.internal }}, CLIENT://${POD_IP}:{{ .Values.ports.client }}" && \
76+
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.coordinator-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.ports.client }}" && \
7777
7878
echo "" >> $FLUSS_HOME/conf/server.yaml && \
7979
echo "bind.listeners: ${BIND_LISTENERS}" >> $FLUSS_HOME/conf/server.yaml && \
@@ -86,16 +86,16 @@ spec:
8686
initialDelaySeconds: 10
8787
periodSeconds: 3
8888
tcpSocket:
89-
port: {{ .Values.listeners.client.port }}
89+
port: {{ .Values.ports.client }}
9090
readinessProbe:
9191
failureThreshold: 100
9292
timeoutSeconds: 1
9393
initialDelaySeconds: 10
9494
periodSeconds: 3
9595
tcpSocket:
96-
port: {{ .Values.listeners.client.port }}
96+
port: {{ .Values.ports.client }}
9797
resources:
98-
{{- toYaml .Values.resources.coordinatorServer | nindent 12 }}
98+
{{- toYaml .Values.coordinatorServer.resources | nindent 12 }}
9999
volumeMounts:
100100
- name: fluss-conf
101101
mountPath: /opt/conf
@@ -105,18 +105,18 @@ spec:
105105
- name: fluss-conf
106106
configMap:
107107
name: fluss-conf-file
108-
{{- if not .Values.coordinator.storage.enabled }}
108+
{{- if not .Values.coordinatorServer.persistence.enabled }}
109109
- name: data
110110
emptyDir: {}
111111
{{- end }}
112-
{{- if .Values.coordinator.storage.enabled }}
112+
{{- if .Values.coordinatorServer.persistence.enabled }}
113113
volumeClaimTemplates:
114114
- metadata:
115115
name: data
116116
spec:
117117
accessModes: [ "ReadWriteOnce" ]
118118
resources:
119119
requests:
120-
storage: {{ .Values.coordinator.storage.size }}
121-
storageClassName: {{ .Values.coordinator.storage.storageClass }}
120+
storage: {{ .Values.coordinatorServer.persistence.size }}
121+
storageClassName: {{ .Values.coordinatorServer.persistence.storageClass }}
122122
{{- end}}

‎helm/templates/sts-tablet.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ spec:
5858
fieldPath: metadata.namespace
5959
ports:
6060
- name: internal
61-
containerPort: {{ .Values.listeners.internal.port }}
61+
containerPort: {{ .Values.ports.internal }}
6262
- name: client
63-
containerPort: {{ .Values.listeners.client.port }}
63+
containerPort: {{ .Values.ports.client }}
6464
command:
6565
- "/bin/sh"
6666
- "-c"
6767
- |
6868
export FLUSS_SERVER_ID=${POD_NAME##*-} && \
6969
cp /opt/conf/server.yaml $FLUSS_HOME/conf && \
7070
71-
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.listeners.internal.port }}, CLIENT://${POD_IP}:{{ .Values.listeners.client.port }}" && \
72-
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.tablet-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.listeners.client.port }}" && \
71+
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.ports.internal }}, CLIENT://${POD_IP}:{{ .Values.ports.client }}" && \
72+
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.tablet-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.ports.client }}" && \
7373
7474
echo "" >> $FLUSS_HOME/conf/server.yaml && \
7575
echo "tablet-server.id: ${FLUSS_SERVER_ID}" >> $FLUSS_HOME/conf/server.yaml && \
@@ -83,16 +83,16 @@ spec:
8383
initialDelaySeconds: 10
8484
periodSeconds: 3
8585
tcpSocket:
86-
port: {{ .Values.listeners.client.port }}
86+
port: {{ .Values.ports.client }}
8787
readinessProbe:
8888
failureThreshold: 100
8989
timeoutSeconds: 1
9090
initialDelaySeconds: 10
9191
periodSeconds: 3
9292
tcpSocket:
93-
port: {{ .Values.listeners.client.port }}
93+
port: {{ .Values.ports.client }}
9494
resources:
95-
{{- toYaml .Values.resources.tabletServer | nindent 12 }}
95+
{{- toYaml .Values.tabletServer.resources | nindent 12 }}
9696
volumeMounts:
9797
- name: fluss-conf
9898
mountPath: /opt/conf
@@ -102,18 +102,18 @@ spec:
102102
- name: fluss-conf
103103
configMap:
104104
name: fluss-conf-file
105-
{{- if not .Values.tablet.storage.enabled }}
105+
{{- if not .Values.tabletServer.persistence.enabled }}
106106
- name: data
107107
emptyDir: {}
108108
{{- end }}
109-
{{- if .Values.tablet.storage.enabled }}
109+
{{- if .Values.tabletServer.persistence.enabled }}
110110
volumeClaimTemplates:
111111
- metadata:
112112
name: data
113113
spec:
114114
accessModes: [ "ReadWriteOnce" ]
115115
resources:
116116
requests:
117-
storage: {{ .Values.tablet.storage.size }}
118-
storageClassName: {{ .Values.tablet.storage.storageClass }}
117+
storage: {{ .Values.tabletServer.persistence.size }}
118+
storageClassName: {{ .Values.tabletServer.persistence.storageClass }}
119119
{{- end}}

‎helm/templates/svc-coordinator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ spec:
2929
ports:
3030
- name: internal
3131
protocol: TCP
32-
port: {{ .Values.listeners.internal.port }}
32+
port: {{ .Values.ports.internal }}
3333
targetPort: internal
3434
- name: client
3535
protocol: TCP
36-
port: {{ .Values.listeners.client.port }}
36+
port: {{ .Values.ports.client }}
3737
targetPort: client
3838
selector:
3939
{{- include "fluss.selectorLabels" . | nindent 4 }}

‎helm/templates/svc-tablet.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ spec:
2929
ports:
3030
- name: internal
3131
protocol: TCP
32-
port: {{ .Values.listeners.internal.port }}
32+
port: {{ .Values.ports.internal }}
3333
targetPort: internal
3434
- name: client
3535
protocol: TCP
36-
port: {{ .Values.listeners.client.port }}
36+
port: {{ .Values.ports.client }}
3737
targetPort: client
3838
selector:
3939
{{- include "fluss.selectorLabels" . | nindent 4 }}

0 commit comments

Comments
 (0)