[sn-platform][sn-platform-slim] Fix pulsarctl config (#1056)

streamnative · Jul 3, 2023 · efd4f83 · efd4f83
1 parent 76f359f
commit efd4f83
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/charts/sn-platform-slim/templates/toolset/_toolset.tpl b/charts/sn-platform-slim/templates/toolset/_toolset.tpl
@@ -176,7 +176,7 @@ Define pulsarctl config volume mount
 */}}
 {{- define "pulsar.toolset.pulsarctl.conf.volumeMounts" -}}
 - name: "{{ template "pulsar.fullname" . }}-{{ .Values.toolset.component }}-pulsarctl"
-  mountPath: "{{ template "pulsar.home" . }}/conf/pulsarctl.config"
+  mountPath: "/home/pulsar/.config/pulsar/config"
   subPath: pulsarctl.config
 {{- end }}
 

diff --git a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
@@ -109,13 +109,10 @@ spec:
         command: ["sh", "-c"]
         args:
         - >
+          set -ex
           bin/apply-config-from-env.py conf/client.conf;
           bin/apply-config-from-env.py conf/bookkeeper.conf;
           {{- include "pulsar.toolset.zookeeper.tls.settings" . | nindent 10 }}
-          echo "Configuring pulsarctl context ...";
-          mkdir -p /root/.config/pulsar;
-          cp {{ template "pulsar.home" . }}/conf/pulsarctl.config /root/.config/pulsar/config;
-          echo "Successfully configured pulsarctl context.";
           sleep 10000000000
         envFrom:
         - configMapRef:

diff --git a/charts/sn-platform/templates/toolset/_toolset.tpl b/charts/sn-platform/templates/toolset/_toolset.tpl
@@ -224,7 +224,7 @@ Define pulsarctl config volume mount
 */}}
 {{- define "pulsar.toolset.pulsarctl.conf.volumeMounts" -}}
 - name: "{{ template "pulsar.fullname" . }}-{{ .Values.toolset.component }}-pulsarctl"
-  mountPath: "{{ template "pulsar.home" . }}/conf/pulsarctl.config"
+  mountPath: "/home/pulsar/.config/pulsar/config"
   subPath: pulsarctl.config
 {{- end }}
 

diff --git a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml
@@ -112,10 +112,6 @@ spec:
           bin/apply-config-from-env.py conf/client.conf;
           bin/apply-config-from-env.py conf/bookkeeper.conf;
           {{- include "pulsar.toolset.zookeeper.tls.settings" . | nindent 10 }}
-          echo "Configuring pulsarctl context ...";
-          mkdir -p /root/.config/pulsar;
-          cp {{ template "pulsar.home" . }}/conf/pulsarctl.config /root/.config/pulsar/config;
-          echo "Successfully configured pulsarctl context.";
           sleep 10000000000
         envFrom:
         - configMapRef: