From d8587dc7c0a10816e2ee5a410fe7858cb2d087f2 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Tue, 31 Aug 2021 19:03:56 +0800
Subject: [PATCH] Upgrade pulsar standalone image version to 2.7.3 (#216)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
---
 charts/milvus/Chart.yaml                      |  2 +-
 .../pulsar-standalone-deployment.yaml         | 22 +++++++++++--------
 charts/milvus/values.yaml                     |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
index a134ecb..a0129c5 100644
--- a/charts/milvus/Chart.yaml
+++ b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.0.0-rc.5"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 2.1.7
+version: 2.1.8
 keywords:
   - milvus
   - elastic
diff --git a/charts/milvus/templates/pulsar-standalone-deployment.yaml b/charts/milvus/templates/pulsar-standalone-deployment.yaml
index ff6b0a9..6d286ea 100644
--- a/charts/milvus/templates/pulsar-standalone-deployment.yaml
+++ b/charts/milvus/templates/pulsar-standalone-deployment.yaml
@@ -28,18 +28,22 @@ spec:
       - name: pulsar
         image: "{{ .Values.pulsarStandalone.image.repository }}:{{ .Values.pulsarStandalone.image.tag }}"
         imagePullPolicy: {{ .Values.pulsarStandalone.image.pullPolicy }}
-        command: ["/bin/sh", "-c"]
+        command: ["/bin/bash", "-c"]
         args:
-          - pulsar_conf_path=/pulsar/conf/standalone.conf;
-            echo "" >> $pulsar_conf_path;
-            echo "maxMessageSize=104857600" >> $pulsar_conf_path;
-            echo "" >> $pulsar_conf_path;
-            echo "nettyMaxFrameSizeBytes=104857600" >> $pulsar_conf_path;
-            sed -i 's/^defaultRetentionTimeInMinutes=.*/defaultRetentionTimeInMinutes=10080/' /pulsar/conf/broker.conf;
+          - bin/apply-config-from-env.py conf/standalone.conf;
             bin/pulsar standalone --no-functions-worker --no-stream-storage;
-
-        {{- if .Values.pulsarStandalone.extraEnv }}
         env:
+          - name: nettyMaxFrameSizeBytes
+            value: "104867840"
+          - name: defaultRetentionTimeInMinutes
+            value: "10080"
+          - name: defaultRetentionSizeInMB
+            value: "-1"
+          - name: PULSAR_PREFIX_maxMessageSize
+            value: "104857600"
+          - name: PULSAR_GC
+            value: "-XX:+UseG1GC"
+        {{- if .Values.pulsarStandalone.extraEnv }}
           {{- toYaml .Values.pulsarStandalone.extraEnv | nindent 10 }}
         {{- end }}
         ports:
diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
index af6ac67..0ee5c59 100644
--- a/charts/milvus/values.yaml
+++ b/charts/milvus/values.yaml
@@ -301,7 +301,7 @@ dataNode:
 pulsarStandalone:
   image:
     repository: apachepulsar/pulsar
-    tag: 2.6.1
+    tag: 2.7.3
     pullPolicy: IfNotPresent
     # pullSecrets:
     #   - myRegistryKeySecretName