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
commit cbc1c68e918ec8dc1e91c39a82e3fe6b674124b3
Author: Sijie Guo <si...@apache.org>
AuthorDate: Mon Apr 6 10:43:51 2020 -0700
Remove PULSAR_PREFIX for k8s yaml and helm values file (#6671)
*Motivation*
In versions older than 2.5.0, PULSAR_PREFIX is used for appending settings
that don't exist in existing configuration files.
*Modifications*
Remove `PULSAR_PREFIX` for backward compatibility
---
pulsar/templates/broker-deployment.yaml | 2 +-
pulsar/values-mini.yaml | 20 ++++++++++----------
pulsar/values.yaml | 22 +++++++++++-----------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pulsar/templates/broker-deployment.yaml
b/pulsar/templates/broker-deployment.yaml
index 4abd2b6..5571489 100644
--- a/pulsar/templates/broker-deployment.yaml
+++ b/pulsar/templates/broker-deployment.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- $ensembleSize :=
.Values.broker.configData.PULSAR_PREFIX_managedLedgerDefaultEnsembleSize }}
+{{- $ensembleSize :=
.Values.broker.configData.managedLedgerDefaultEnsembleSize }}
apiVersion: apps/v1
kind: Deployment
metadata:
diff --git a/pulsar/values-mini.yaml b/pulsar/values-mini.yaml
index 375f8df..6ca118e 100644
--- a/pulsar/values-mini.yaml
+++ b/pulsar/values-mini.yaml
@@ -183,11 +183,11 @@ bookkeeper:
configData:
BOOKIE_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
BOOKIE_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "32"
- PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "32"
- PULSAR_PREFIX_journalMaxSizeMB: "2048"
- PULSAR_PREFIX_statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
- PULSAR_PREFIX_useHostNameAsBookieID: "true"
+ dbStorage_writeCacheMaxSizeMb: "32"
+ dbStorage_readAheadCacheMaxSizeMb: "32"
+ journalMaxSizeMB: "2048"
+ statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
+ useHostNameAsBookieID: "true"
## Bookkeeper configmap
## templates/bookkeeper-service.yaml
##
@@ -227,11 +227,11 @@ broker:
configData:
PULSAR_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
PULSAR_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- PULSAR_PREFIX_managedLedgerDefaultEnsembleSize: "2"
- PULSAR_PREFIX_managedLedgerDefaultWriteQuorum: "2"
- PULSAR_PREFIX_managedLedgerDefaultAckQuorum: "2"
- PULSAR_PREFIX_deduplicationEnabled: "false"
- PULSAR_PREFIX_exposeTopicLevelMetricsInPrometheus: "true"
+ managedLedgerDefaultEnsembleSize: "2"
+ managedLedgerDefaultWriteQuorum: "2"
+ managedLedgerDefaultAckQuorum: "2"
+ deduplicationEnabled: "false"
+ exposeTopicLevelMetricsInPrometheus: "true"
## Broker service
## templates/broker-service.yaml
##
diff --git a/pulsar/values.yaml b/pulsar/values.yaml
index afe0d5c..14637d9 100644
--- a/pulsar/values.yaml
+++ b/pulsar/values.yaml
@@ -183,12 +183,12 @@ bookkeeper:
configData:
BOOKIE_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime
-XX:+Pri [...]
BOOKIE_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "2048"
- PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "2048"
- PULSAR_PREFIX_dbStorage_rocksDB_blockCacheSize: "268435456"
- PULSAR_PREFIX_journalMaxSizeMB: "2048"
- PULSAR_PREFIX_statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
- PULSAR_PREFIX_useHostNameAsBookieID: "true"
+ dbStorage_writeCacheMaxSizeMb: "2048"
+ dbStorage_readAheadCacheMaxSizeMb: "2048"
+ dbStorage_rocksDB_blockCacheSize: "268435456"
+ journalMaxSizeMB: "2048"
+ statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
+ useHostNameAsBookieID: "true"
## Bookkeeper configmap
## templates/bookkeeper-service.yaml
##
@@ -228,11 +228,11 @@ broker:
configData:
PULSAR_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
PULSAR_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- PULSAR_PREFIX_managedLedgerDefaultEnsembleSize: "3"
- PULSAR_PREFIX_managedLedgerDefaultWriteQuorum: "3"
- PULSAR_PREFIX_managedLedgerDefaultAckQuorum: "2"
- PULSAR_PREFIX_deduplicationEnabled: "false"
- PULSAR_PREFIX_exposeTopicLevelMetricsInPrometheus: "true"
+ managedLedgerDefaultEnsembleSize: "3"
+ managedLedgerDefaultWriteQuorum: "3"
+ managedLedgerDefaultAckQuorum: "2"
+ deduplicationEnabled: "false"
+ exposeTopicLevelMetricsInPrometheus: "true"
## Broker service
## templates/broker-service.yaml
##
