Make the backup can run when zookeeper reconfig enabled (#1143)

* Make the backup can run when zookeeper reconfig enabled * Apply change to the platform slim * fix chart lint Signed-off-by: ericsyh <[email protected]> * fix chart lint Signed-off-by: ericsyh <[email protected]> --------- Signed-off-by: ericsyh <[email protected]> Co-authored-by: Eric Shen <[email protected]> (cherry picked from commit 023056b)
streamnative · Mar 11, 2024 · 2abd661 · 2abd661
1 parent 1987f8f
commit 2abd661
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/charts/sn-platform-slim/Chart.yaml b/charts/sn-platform-slim/Chart.yaml
@@ -28,4 +28,4 @@ sources:
 icon: https://raw.githubusercontent.com/streamnative/charts/master/static/logo.svg
 maintainers:
 - name: StreamNative Support
-  email: [email protected]
+  email: [email protected]
diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml
@@ -48,10 +48,6 @@ data:
   secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
   PULSAR_PREFIX_secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
   {{- end }}
-  {{- if .Values.zookeeper.reconfig.enabled }}
-  PULSAR_PREFIX_reconfigEnabled: "true"
-  PULSAR_PREFIX_quorumListenOnAllIPs: "true"
-  {{- end }}
   PULSAR_PREFIX_peerType: "observer"
 {{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }}
   # Include log configuration file, If you want to configure the log level and other configuration

diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-statefulset.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-statefulset.yaml
@@ -154,7 +154,7 @@ spec:
             {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }}
         envFrom:
         - configMapRef:
-            name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
+            name: "{{ template "pulsar.fullname" . }}-backup"
         {{- if .Values.zookeeper.probe.readiness.enabled }}
         readinessProbe:
           exec:

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -1042,7 +1042,7 @@ broker:
     format: "text"
   # The template field can totally change the log config of the component. The value is a string, which is the content of the log config file.
     template: {}
-  
+
   # use a component name that matches your grafana configuration
   # so the metrics are correctly rendered in grafana dashboard
   component: broker
@@ -1202,8 +1202,8 @@ broker:
     delayedDeliveryTrackerFactoryClassName: "org.apache.pulsar.broker.delayed.BucketDelayedDeliveryTrackerFactory"
     # Enable transaction buffer segmented snapshot
     transactionBufferSegmentedSnapshotEnabled: "true"
-    # Enable the new Load Balancer, please make sure your cluster is already on Pulsar 3.0 then to use. 
-    # Mix of new and previous Load Balancer in the same cluster will lead to unexpected problems. 
+    # Enable the new Load Balancer, please make sure your cluster is already on Pulsar 3.0 then to use.
+    # Mix of new and previous Load Balancer in the same cluster will lead to unexpected problems.
     # loadManagerClassName: "org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl"
     # loadBalancerLoadSheddingStrategy: "org.apache.pulsar.broker.loadbalance.extensions.scheduler.TransferShedder"
   ### Broker service account

diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml
@@ -48,10 +48,6 @@ data:
   secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
   PULSAR_PREFIX_secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
   {{- end }}
-  {{- if .Values.zookeeper.reconfig.enabled }}
-  PULSAR_PREFIX_reconfigEnabled: "true"
-  PULSAR_PREFIX_quorumListenOnAllIPs: "true"
-  {{- end }}
   PULSAR_PREFIX_peerType: "observer"
 {{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }}
   # Include log configuration file, If you want to configure the log level and other configuration

diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-backup-statefulset.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-backup-statefulset.yaml
@@ -154,7 +154,7 @@ spec:
             {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }}
         envFrom:
         - configMapRef:
-            name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
+            name: "{{ template "pulsar.fullname" . }}-backup"
         {{- if .Values.zookeeper.probe.readiness.enabled }}
         readinessProbe:
           exec: