This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new f98ee7d Replace ">" with "|" to avoid Go Yaml issue go-yaml/yaml#789
(#582)
f98ee7d is described below
commit f98ee7d69ce4b81e4217db5dd5f0fb8e998c6d4a
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Tue Mar 4 12:21:39 2025 +0200
Replace ">" with "|" to avoid Go Yaml issue go-yaml/yaml#789 (#582)
---
charts/pulsar/templates/autorecovery-statefulset.yaml | 4 ++--
charts/pulsar/templates/bookkeeper-cluster-initialize.yaml | 6 +++---
charts/pulsar/templates/bookkeeper-statefulset.yaml | 4 ++--
charts/pulsar/templates/broker-statefulset.yaml | 8 ++++----
charts/pulsar/templates/proxy-statefulset.yaml | 8 ++++----
charts/pulsar/templates/pulsar-cluster-initialize.yaml | 8 ++++----
charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml | 2 +-
charts/pulsar/templates/toolset-statefulset.yaml | 2 +-
charts/pulsar/templates/zookeeper-statefulset.yaml | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/charts/pulsar/templates/autorecovery-statefulset.yaml
b/charts/pulsar/templates/autorecovery-statefulset.yaml
index 811b240..2a8c1c7 100644
--- a/charts/pulsar/templates/autorecovery-statefulset.yaml
+++ b/charts/pulsar/templates/autorecovery-statefulset.yaml
@@ -119,7 +119,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.autorecovery.waitBookkeeperTimeout
}}", "sh", "-c"]
args:
- - >
+ - |
{{- include "pulsar.autorecovery.init.verify_cluster_id" . | nindent
10 }}
envFrom:
- configMapRef:
@@ -144,7 +144,7 @@ spec:
{{- end}}
command: ["sh", "-c"]
args:
- - >
+ - |
bin/apply-config-from-env.py conf/bookkeeper.conf;
{{- include "pulsar.autorecovery.zookeeper.tls.settings" . | nindent
10 }}
OPTS="${OPTS} -Dlog4j2.formatMsgNoLookups=true" exec bin/bookkeeper
autorecovery
diff --git a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml
b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml
index bfee3a6..c4ecbfb 100755
--- a/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml
+++ b/charts/pulsar/templates/bookkeeper-cluster-initialize.yaml
@@ -52,7 +52,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{
.Values.bookkeeper.metadata.waitZookeeperTimeout }}", "sh", "-c"]
args:
- - >-
+ - |
{{- if $zk:=.Values.pulsar_metadata.userProvidedZookeepers }}
export PULSAR_MEM="-Xmx128M";
until timeout 15 bin/pulsar zookeeper-shell -server {{ $zk }} ls
{{ or .Values.metadataPrefix "/" }}; do
@@ -71,7 +71,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.bookkeeper.metadata.waitOxiaTimeout
}}", "sh", "-c"]
args:
- - >-
+ - |
until nslookup {{ template "pulsar.oxia.server.service" . }}; do
sleep 3;
done;
@@ -86,7 +86,7 @@ spec:
{{- end }}
command: ["timeout", "{{ .Values.bookkeeper.metadata.initTimeout |
default 60 }}", "sh", "-c"]
args:
- - >
+ - |
bin/apply-config-from-env.py conf/bookkeeper.conf;
{{- include "pulsar.toolset.zookeeper.tls.settings" . | nindent 12
}}
export BOOKIE_MEM="-Xmx128M";
diff --git a/charts/pulsar/templates/bookkeeper-statefulset.yaml
b/charts/pulsar/templates/bookkeeper-statefulset.yaml
index 16799bc..b2ce827 100644
--- a/charts/pulsar/templates/bookkeeper-statefulset.yaml
+++ b/charts/pulsar/templates/bookkeeper-statefulset.yaml
@@ -121,7 +121,7 @@ spec:
command: ["timeout", "{{ .Values.bookkeeper.waitMetadataTimeout }}",
"sh", "-c"]
args:
# only reformat bookie if bookkeeper is running without persistence
- - >
+ - |
{{- include "pulsar.bookkeeper.init.verify_cluster_id" . | nindent
10 }}
envFrom:
- configMapRef:
@@ -176,7 +176,7 @@ spec:
{{- end }}
command: ["sh", "-c"]
args:
- - >
+ - |
{{- if .Values.bookkeeper.additionalCommand }}
{{ .Values.bookkeeper.additionalCommand }}
{{- end }}
diff --git a/charts/pulsar/templates/broker-statefulset.yaml
b/charts/pulsar/templates/broker-statefulset.yaml
index 0c9bf5b..3822725 100644
--- a/charts/pulsar/templates/broker-statefulset.yaml
+++ b/charts/pulsar/templates/broker-statefulset.yaml
@@ -136,7 +136,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.broker.waitZookeeperTimeout }}",
"sh", "-c"]
args:
- - >-
+ - |
{{- include "pulsar.broker.zookeeper.tls.settings" . | nindent 12
}}
export PULSAR_MEM="-Xmx128M";
{{- if .Values.pulsar_metadata.configurationStore }}
@@ -161,7 +161,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.broker.waitOxiaTimeout }}", "sh",
"-c"]
args:
- - >-
+ - |
until nslookup {{ template "pulsar.oxia.server.service" . }}; do
sleep 3;
done;
@@ -175,7 +175,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.broker.waitBookkeeperTimeout }}",
"sh", "-c"]
args:
- - >
+ - |
{{- include "pulsar.broker.zookeeper.tls.settings" . | nindent 12
}}
bin/apply-config-from-env.py conf/bookkeeper.conf;
export BOOKIE_MEM="-Xmx128M";
@@ -244,7 +244,7 @@ spec:
{{- end }}
command: ["sh", "-c"]
args:
- - >
+ - |
{{- if .Values.broker.additionalCommand }}
{{ .Values.broker.additionalCommand }}
{{- end }}
diff --git a/charts/pulsar/templates/proxy-statefulset.yaml
b/charts/pulsar/templates/proxy-statefulset.yaml
index 73c5bae..15a264b 100644
--- a/charts/pulsar/templates/proxy-statefulset.yaml
+++ b/charts/pulsar/templates/proxy-statefulset.yaml
@@ -118,7 +118,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.proxy.waitZookeeperTimeout }}", "sh",
"-c"]
args:
- - >-
+ - |
export PULSAR_MEM="-Xmx128M";
{{- if $zk:=.Values.pulsar_metadata.userProvidedZookeepers }}
until timeout 15 bin/pulsar zookeeper-shell -server {{ $zk }} ls
{{ or .Values.metadataPrefix "/" }}; do
@@ -137,7 +137,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.proxy.waitOxiaTimeout }}", "sh", "-c"]
args:
- - >-
+ - |
until nslookup {{ template "pulsar.oxia.server.service" . }}; do
sleep 3;
done;
@@ -151,7 +151,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.proxy.waitBrokerTimeout }}", "sh",
"-c"]
args:
- - >-
+ - |
set -e;
brokerServiceNumber="$(nslookup -timeout=10 {{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }} | grep Name | wc -l)";
until [ ${brokerServiceNumber} -ge 1 ]; do
@@ -203,7 +203,7 @@ spec:
{{- end }}
command: ["sh", "-c"]
args:
- - >
+ - |
{{- if .Values.proxy.additionalCommand }}
{{ .Values.proxy.additionalCommand }}
{{- end }}
diff --git a/charts/pulsar/templates/pulsar-cluster-initialize.yaml
b/charts/pulsar/templates/pulsar-cluster-initialize.yaml
index af45d3e..dfe577c 100755
--- a/charts/pulsar/templates/pulsar-cluster-initialize.yaml
+++ b/charts/pulsar/templates/pulsar-cluster-initialize.yaml
@@ -49,7 +49,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.pulsar_metadata.waitZookeeperTimeout
}}", "sh", "-c"]
args:
- - >-
+ - |
until nslookup {{ .Values.pulsar_metadata.configurationStore}}; do
sleep 3;
done;
@@ -60,7 +60,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.pulsar_metadata.waitZookeeperTimeout
}}", "sh", "-c"]
args:
- - >-
+ - |
{{- if $zk := .Values.pulsar_metadata.userProvidedZookeepers }}
export PULSAR_MEM="-Xmx128M";
until timeout 15 bin/pulsar zookeeper-shell -server {{ $zk }} ls
{{ or .Values.metadataPrefix "/" }}; do
@@ -79,7 +79,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.pulsar_metadata.waitOxiaTimeout }}",
"sh", "-c"]
args:
- - >-
+ - |
until nslookup {{ template "pulsar.oxia.server.service" . }}; do
sleep 3;
done;
@@ -93,7 +93,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 10 }}
command: ["timeout", "{{ .Values.pulsar_metadata.waitBookkeeperTimeout
}}", "sh", "-c"]
args:
- - >-
+ - |
bin/apply-config-from-env.py conf/bookkeeper.conf;
echo Default BOOKIE_MEM settings are set very high, which can cause
the init container to fail.;
echo Setting the memory to a lower value to avoid OOM as operations
below are not memory intensive.;
diff --git a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
index 6fe3423..e0f2b6a 100755
--- a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
+++ b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
@@ -64,7 +64,7 @@ spec:
resources: {{ toYaml .Values.initContainer.resources | nindent 12 }}
command: [ "sh", "-c" ]
args:
- - >-
+ - |
set -e;
brokerServiceNumber="$(nslookup -timeout=10 {{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }} | grep Name | wc -l)";
until [ ${brokerServiceNumber} -ge 1 ]; do
diff --git a/charts/pulsar/templates/toolset-statefulset.yaml
b/charts/pulsar/templates/toolset-statefulset.yaml
index c037d66..602e39d 100644
--- a/charts/pulsar/templates/toolset-statefulset.yaml
+++ b/charts/pulsar/templates/toolset-statefulset.yaml
@@ -82,7 +82,7 @@ spec:
{{- end }}
command: ["sh", "-c"]
args:
- - >
+ - |
{{- if .Values.toolset.additionalCommand }}
{{ .Values.toolset.additionalCommand }}
{{- end }}
diff --git a/charts/pulsar/templates/zookeeper-statefulset.yaml
b/charts/pulsar/templates/zookeeper-statefulset.yaml
index 972c154..15bb649 100755
--- a/charts/pulsar/templates/zookeeper-statefulset.yaml
+++ b/charts/pulsar/templates/zookeeper-statefulset.yaml
@@ -123,7 +123,7 @@ spec:
{{- end }}
command: ["sh", "-c"]
args:
- - >
+ - |
{{- if .Values.zookeeper.additionalCommand }}
{{ .Values.zookeeper.additionalCommand }}
{{- end }}
