From 4d4ea5a2fc5f50729a2d2d54794d16376972ed8d Mon Sep 17 00:00:00 2001
From: Lorenzo Affetti <lorenzo.affetti@gmail.com>
Date: Fri, 13 Mar 2026 10:43:22 +0100
Subject: [PATCH] [Helm] Revert Chart Component Configuration Isolation (#2472)

This reverts commit d956e75b6f45dcd5264dafd5fd31c4a7a8cd8c04.
---
 helm/templates/sts-coordinator.yaml | 18 +++++++-------
 helm/templates/sts-tablet.yaml      | 18 +++++++-------
 helm/values.yaml                    | 38 +++++++----------------------
 3 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/helm/templates/sts-coordinator.yaml b/helm/templates/sts-coordinator.yaml
index b19326da67..6e187bd982 100644
--- a/helm/templates/sts-coordinator.yaml
+++ b/helm/templates/sts-coordinator.yaml
@@ -24,7 +24,7 @@ metadata:
   {{- include "fluss.labels" . | nindent 4 }}
 spec:
   serviceName: coordinator-server-hs
-  replicas: {{ .Values.coordinatorServer.replicas }}
+  replicas: {{ .Values.coordinator.numberOfReplicas }}
   selector:
     matchLabels:
       {{- include "fluss.selectorLabels" . | nindent 6 }}
@@ -81,17 +81,17 @@ spec:
 
               bin/coordinator-server.sh start-foreground
           livenessProbe:
-            failureThreshold: {{ .Values.coordinatorServer.livenessProbe.failureThreshold }}
-            timeoutSeconds: {{ .Values.coordinatorServer.livenessProbe.timeoutSeconds }}
-            initialDelaySeconds: {{ .Values.coordinatorServer.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.coordinatorServer.livenessProbe.periodSeconds }}
+            failureThreshold: 100
+            timeoutSeconds: 1
+            initialDelaySeconds: 10
+            periodSeconds: 3
             tcpSocket:
               port: {{ .Values.listeners.client.port }}
           readinessProbe:
-            failureThreshold: {{ .Values.coordinatorServer.readinessProbe.failureThreshold }}
-            timeoutSeconds: {{ .Values.coordinatorServer.readinessProbe.timeoutSeconds }}
-            initialDelaySeconds: {{ .Values.coordinatorServer.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.coordinatorServer.readinessProbe.periodSeconds }}
+            failureThreshold: 100
+            timeoutSeconds: 1
+            initialDelaySeconds: 10
+            periodSeconds: 3
             tcpSocket:
               port: {{ .Values.listeners.client.port }}
           resources:
diff --git a/helm/templates/sts-tablet.yaml b/helm/templates/sts-tablet.yaml
index 405952c26d..aa60cf462c 100644
--- a/helm/templates/sts-tablet.yaml
+++ b/helm/templates/sts-tablet.yaml
@@ -24,7 +24,7 @@ metadata:
   {{- include "fluss.labels" . | nindent 4 }}
 spec:
   serviceName: tablet-server-hs
-  replicas: {{ .Values.tabletServer.replicas }}
+  replicas: {{ .Values.tablet.numberOfReplicas }}
   selector:
     matchLabels:
       {{- include "fluss.selectorLabels" . | nindent 6 }}
@@ -78,17 +78,17 @@ spec:
 
               bin/tablet-server.sh start-foreground
           livenessProbe:
-            failureThreshold: {{ .Values.tabletServer.livenessProbe.failureThreshold }}
-            timeoutSeconds: {{ .Values.tabletServer.livenessProbe.timeoutSeconds }}
-            initialDelaySeconds: {{ .Values.tabletServer.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.tabletServer.livenessProbe.periodSeconds }}
+            failureThreshold: 100
+            timeoutSeconds: 1
+            initialDelaySeconds: 10
+            periodSeconds: 3
             tcpSocket:
               port: {{ .Values.listeners.client.port }}
           readinessProbe:
-            failureThreshold: {{ .Values.tabletServer.readinessProbe.failureThreshold }}
-            timeoutSeconds: {{ .Values.tabletServer.readinessProbe.timeoutSeconds }}
-            initialDelaySeconds: {{ .Values.tabletServer.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.tabletServer.readinessProbe.periodSeconds }}
+            failureThreshold: 100
+            timeoutSeconds: 1
+            initialDelaySeconds: 10
+            periodSeconds: 3
             tcpSocket:
               port: {{ .Values.listeners.client.port }}
           resources:
diff --git a/helm/values.yaml b/helm/values.yaml
index f561a9a536..db5d3fc2a9 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -27,32 +27,6 @@ image:
   pullPolicy: IfNotPresent
   pullSecrets: []
 
-coordinatorServer:
-  replicas: 1
-  livenessProbe:
-    failureThreshold: 100
-    timeoutSeconds: 1
-    initialDelaySeconds: 10
-    periodSeconds: 3
-  readinessProbe:
-    failureThreshold: 100
-    timeoutSeconds: 1
-    initialDelaySeconds: 10
-    periodSeconds: 3
-
-tabletServer:
-  replicas: 3
-  livenessProbe:
-    failureThreshold: 100
-    timeoutSeconds: 1
-    initialDelaySeconds: 10
-    periodSeconds: 3
-  readinessProbe:
-    failureThreshold: 100
-    timeoutSeconds: 1
-    initialDelaySeconds: 10
-    periodSeconds: 3
-
 # Fluss server configuration options
 configurationOverrides:
   default.bucket.number: 3
@@ -64,12 +38,14 @@ configurationOverrides:
   internal.listener.name: INTERNAL
 
 tablet:
+  numberOfReplicas: 3
   storage:
     enabled: false
     size: 1Gi
     storageClass:
 
 coordinator:
+  numberOfReplicas: 1
   storage:
     enabled: false
     size: 1Gi
@@ -82,15 +58,19 @@ listeners:
   client:
     port: 9124
 
-resources:
-  coordinatorServer: {}
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # coordinatorServer:
   #   limits:
   #     cpu: 100m
   #     memory: 128Mi
   #   requests:
   #     cpu: 100m
   #     memory: 128Mi
-  tabletServer: {}
+  # tabletServer:
   #   requests:
   #     cpu: 100m
   #     memory: 128Mi