You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2020/06/26 03:24:13 UTC
[pulsar-helm-chart] branch master updated: Don't substitute
environment variables (#28)
This is an automated email from the ASF dual-hosted git repository.
sijie 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 1c8a434 Don't substitute environment variables (#28)
1c8a434 is described below
commit 1c8a434ef69c123e3ff6a74148a1b0688d6e1b13
Author: Sijie Guo <si...@apache.org>
AuthorDate: Thu Jun 25 20:24:03 2020 -0700
Don't substitute environment variables (#28)
*Motivation*
environment variables are already taken by bash scripts. We don't need to substitute them.
---
charts/pulsar/templates/autorecovery-statefulset.yaml | 1 -
charts/pulsar/templates/bookkeeper-statefulset.yaml | 2 --
charts/pulsar/templates/broker-statefulset.yaml | 1 -
charts/pulsar/templates/proxy-statefulset.yaml | 1 -
charts/pulsar/templates/zookeeper-statefulset.yaml | 1 -
5 files changed, 6 deletions(-)
diff --git a/charts/pulsar/templates/autorecovery-statefulset.yaml b/charts/pulsar/templates/autorecovery-statefulset.yaml
index c4e1f61..1a944c8 100644
--- a/charts/pulsar/templates/autorecovery-statefulset.yaml
+++ b/charts/pulsar/templates/autorecovery-statefulset.yaml
@@ -107,7 +107,6 @@ spec:
args:
- >
bin/apply-config-from-env.py conf/bookkeeper.conf;
- bin/apply-config-from-env.py conf/bkenv.sh;
{{- include "pulsar.autorecovery.zookeeper.tls.settings" . | nindent 10 }}
bin/bookkeeper autorecovery
ports:
diff --git a/charts/pulsar/templates/bookkeeper-statefulset.yaml b/charts/pulsar/templates/bookkeeper-statefulset.yaml
index 71df9ab..46d7dc7 100644
--- a/charts/pulsar/templates/bookkeeper-statefulset.yaml
+++ b/charts/pulsar/templates/bookkeeper-statefulset.yaml
@@ -132,8 +132,6 @@ spec:
args:
- >
bin/apply-config-from-env.py conf/bookkeeper.conf;
- bin/apply-config-from-env.py conf/pulsar_env.sh;
- bin/apply-config-from-env.py conf/bkenv.sh;
{{- include "pulsar.bookkeeper.zookeeper.tls.settings" . | nindent 10 }}
bin/pulsar bookie;
ports:
diff --git a/charts/pulsar/templates/broker-statefulset.yaml b/charts/pulsar/templates/broker-statefulset.yaml
index 591c104..605cd64 100644
--- a/charts/pulsar/templates/broker-statefulset.yaml
+++ b/charts/pulsar/templates/broker-statefulset.yaml
@@ -164,7 +164,6 @@ spec:
args:
- >
bin/apply-config-from-env.py conf/broker.conf;
- bin/apply-config-from-env.py conf/pulsar_env.sh;
bin/gen-yml-from-env.py conf/functions_worker.yml;
echo "OK" > status;
{{- include "pulsar.broker.zookeeper.tls.settings" . | nindent 10 }}
diff --git a/charts/pulsar/templates/proxy-statefulset.yaml b/charts/pulsar/templates/proxy-statefulset.yaml
index d974c0f..c3cc7a0 100644
--- a/charts/pulsar/templates/proxy-statefulset.yaml
+++ b/charts/pulsar/templates/proxy-statefulset.yaml
@@ -143,7 +143,6 @@ spec:
args:
- >
bin/apply-config-from-env.py conf/proxy.conf &&
- bin/apply-config-from-env.py conf/pulsar_env.sh &&
echo "OK" > status &&
bin/pulsar proxy
ports:
diff --git a/charts/pulsar/templates/zookeeper-statefulset.yaml b/charts/pulsar/templates/zookeeper-statefulset.yaml
index dc78cfd..598a3cf 100644
--- a/charts/pulsar/templates/zookeeper-statefulset.yaml
+++ b/charts/pulsar/templates/zookeeper-statefulset.yaml
@@ -86,7 +86,6 @@ spec:
args:
- >
bin/apply-config-from-env.py conf/zookeeper.conf;
- bin/apply-config-from-env.py conf/pulsar_env.sh;
{{- include "pulsar.zookeeper.tls.settings" . | nindent 10 }}
bin/generate-zookeeper-config.sh conf/zookeeper.conf;
bin/pulsar zookeeper;