Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .github/workflows/helm-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@ jobs:
- name: "Checkout code"
uses: actions/checkout@v6

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
python-version: "3.11"
python-version: "3.12"

Just better to point to that one if we don't break anything

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to unify the Python version with .github/workflows/unstable-test-reporter.yaml


- name: Install dependencies
run: pip install -r tools/ci/helm_ci/requirements.txt

- name: Run validate values
run: python tools/ci/helm_ci/validate_helm.py

- name: "Lint Helm chart"
run: helm lint ./helm

Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,10 @@ website/versioned_docs
website/versioned_sidebars
website/versions.json
website/pnpm-lock.yaml

### Python ###
.venv/
venv/
env/
.env
__pycache__/
40 changes: 20 additions & 20 deletions helm/templates/sts-coordinator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
{{- include "fluss.labels" . | nindent 4 }}
spec:
serviceName: coordinator-server-hs
replicas: {{ .Values.coordinator.numberOfReplicas }}
replicas: {{ .Values.coordinatorServer.replicas }}
selector:
matchLabels:
{{- include "fluss.selectorLabels" . | nindent 6 }}
Expand Down Expand Up @@ -66,40 +66,40 @@ spec:
{{- end }}
ports:
- name: internal
containerPort: {{ .Values.listeners.internal.port }}
containerPort: {{ .Values.ports.internal }}
- name: client
containerPort: {{ .Values.listeners.client.port }}
containerPort: {{ .Values.ports.client }}
command:
- "/bin/sh"
- "-c"
- |
export FLUSS_SERVER_ID=${POD_NAME##*-} && \
cp /opt/conf/server.yaml $FLUSS_HOME/conf && \

BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.listeners.internal.port }}, CLIENT://${POD_IP}:{{ .Values.listeners.client.port }}" && \
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.coordinator-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.listeners.client.port }}" && \
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.ports.internal }}, CLIENT://${POD_IP}:{{ .Values.ports.client }}" && \
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.coordinator-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.ports.client }}" && \

echo "" >> $FLUSS_HOME/conf/server.yaml && \
echo "bind.listeners: ${BIND_LISTENERS}" >> $FLUSS_HOME/conf/server.yaml && \
echo "advertised.listeners: ${ADVERTISED_LISTENERS}" >> $FLUSS_HOME/conf/server.yaml && \

bin/coordinator-server.sh start-foreground
livenessProbe:
failureThreshold: 100
timeoutSeconds: 1
initialDelaySeconds: 10
periodSeconds: 3
failureThreshold: {{ .Values.coordinatorServer.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.coordinatorServer.livenessProbe.timeoutSeconds }}
initialDelaySeconds: {{ .Values.coordinatorServer.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.coordinatorServer.livenessProbe.periodSeconds }}
tcpSocket:
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
readinessProbe:
failureThreshold: 100
timeoutSeconds: 1
initialDelaySeconds: 10
periodSeconds: 3
failureThreshold: {{ .Values.coordinatorServer.readinessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.coordinatorServer.readinessProbe.timeoutSeconds }}
initialDelaySeconds: {{ .Values.coordinatorServer.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.coordinatorServer.readinessProbe.periodSeconds }}
tcpSocket:
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
resources:
{{- toYaml .Values.resources.tabletServer | nindent 12 }}
{{- toYaml .Values.coordinatorServer.resources | nindent 12 }}
volumeMounts:
- name: fluss-conf
mountPath: /opt/conf
Expand All @@ -114,7 +114,7 @@ spec:
- name: fluss-conf
configMap:
name: fluss-conf-file
{{- if not .Values.coordinator.storage.enabled }}
{{- if not .Values.coordinatorServer.persistence.enabled }}
- name: data
emptyDir: {}
{{- end }}
Expand All @@ -123,14 +123,14 @@ spec:
secret:
secretName: {{ include "fluss.security.sasl.configName" . }}
{{- end }}
{{- if .Values.coordinator.storage.enabled }}
{{- if .Values.coordinatorServer.persistence.enabled }}
volumeClaimTemplates:
- metadata:
name: data
spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: {{ .Values.coordinator.storage.size }}
storageClassName: {{ .Values.coordinator.storage.storageClass }}
storage: {{ .Values.coordinatorServer.persistence.size }}
storageClassName: {{ .Values.coordinatorServer.persistence.storageClass }}
{{- end}}
40 changes: 20 additions & 20 deletions helm/templates/sts-tablet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
{{- include "fluss.labels" . | nindent 4 }}
spec:
serviceName: tablet-server-hs
replicas: {{ .Values.tablet.numberOfReplicas }}
replicas: {{ .Values.tabletServer.replicas }}
selector:
matchLabels:
{{- include "fluss.selectorLabels" . | nindent 6 }}
Expand Down Expand Up @@ -62,18 +62,18 @@ spec:
{{- end }}
ports:
- name: internal
containerPort: {{ .Values.listeners.internal.port }}
containerPort: {{ .Values.ports.internal }}
- name: client
containerPort: {{ .Values.listeners.client.port }}
containerPort: {{ .Values.ports.client }}
command:
- "/bin/sh"
- "-c"
- |
export FLUSS_SERVER_ID=${POD_NAME##*-} && \
cp /opt/conf/server.yaml $FLUSS_HOME/conf && \

BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.listeners.internal.port }}, CLIENT://${POD_IP}:{{ .Values.listeners.client.port }}" && \
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.tablet-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.listeners.client.port }}" && \
BIND_LISTENERS="INTERNAL://${POD_IP}:{{ .Values.ports.internal }}, CLIENT://${POD_IP}:{{ .Values.ports.client }}" && \
ADVERTISED_LISTENERS="CLIENT://${POD_NAME}.tablet-server-hs.${POD_NAMESPACE}.svc.cluster.local:{{ .Values.ports.client }}" && \

echo "" >> $FLUSS_HOME/conf/server.yaml && \
echo "tablet-server.id: ${FLUSS_SERVER_ID}" >> $FLUSS_HOME/conf/server.yaml && \
Expand All @@ -82,21 +82,21 @@ spec:

bin/tablet-server.sh start-foreground
livenessProbe:
failureThreshold: 100
timeoutSeconds: 1
initialDelaySeconds: 10
periodSeconds: 3
failureThreshold: {{ .Values.tabletServer.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.tabletServer.livenessProbe.timeoutSeconds }}
initialDelaySeconds: {{ .Values.tabletServer.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.tabletServer.livenessProbe.periodSeconds }}
tcpSocket:
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
readinessProbe:
failureThreshold: 100
timeoutSeconds: 1
initialDelaySeconds: 10
periodSeconds: 3
failureThreshold: {{ .Values.tabletServer.readinessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.tabletServer.readinessProbe.timeoutSeconds }}
initialDelaySeconds: {{ .Values.tabletServer.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.tabletServer.readinessProbe.periodSeconds }}
tcpSocket:
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
resources:
{{- toYaml .Values.resources.tabletServer | nindent 12 }}
{{- toYaml .Values.tabletServer.resources | nindent 12 }}
volumeMounts:
- name: fluss-conf
mountPath: /opt/conf
Expand All @@ -111,7 +111,7 @@ spec:
- name: fluss-conf
configMap:
name: fluss-conf-file
{{- if not .Values.tablet.storage.enabled }}
{{- if not .Values.tabletServer.persistence.enabled }}
- name: data
emptyDir: {}
{{- end }}
Expand All @@ -120,14 +120,14 @@ spec:
secret:
secretName: {{ include "fluss.security.sasl.configName" . }}
{{- end }}
{{- if .Values.tablet.storage.enabled }}
{{- if .Values.tabletServer.persistence.enabled }}
volumeClaimTemplates:
- metadata:
name: data
spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: {{ .Values.tablet.storage.size }}
storageClassName: {{ .Values.tablet.storage.storageClass }}
storage: {{ .Values.tabletServer.persistence.size }}
storageClassName: {{ .Values.tabletServer.persistence.storageClass }}
{{- end}}
4 changes: 2 additions & 2 deletions helm/templates/svc-coordinator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ spec:
ports:
- name: internal
protocol: TCP
port: {{ .Values.listeners.internal.port }}
port: {{ .Values.ports.internal }}
targetPort: internal
- name: client
protocol: TCP
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
targetPort: client
selector:
{{- include "fluss.selectorLabels" . | nindent 4 }}
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/svc-tablet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ spec:
ports:
- name: internal
protocol: TCP
port: {{ .Values.listeners.internal.port }}
port: {{ .Values.ports.internal }}
targetPort: internal
- name: client
protocol: TCP
port: {{ .Values.listeners.client.port }}
port: {{ .Values.ports.client }}
targetPort: client
selector:
{{- include "fluss.selectorLabels" . | nindent 4 }}
Expand Down
Loading
Loading