improve

Author: labuladong

charts/sn-platform-slim/templates/bookkeeper/bookkeeper-cluster.yaml

@@ -364,6 +364,12 @@ spec:
                     env;
                     {{- end }}
                     bin/pulsar-metadata-tool cleanup
+                {{- if .Values.bookkeeper.initContainerSecurityContext }}
+                securityContext: {{- toYaml .Values.bookkeeper.initContainerSecurityContext | nindent 16 }}
+                {{- end }}
+                {{- if .Values.bookkeeper.resources }}
+                resources: {{- toYaml .Values.bookkeeper.resources | nindent 16 }}
+                {{- end }}
                 env:
                 - name: METADATA_TOOL_CONF
                   value: "/pulsar-metadata-tool/conf/pulsar-metadata-tool/pulsar-metadata-tool.properties"

charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml

@@ -71,6 +71,9 @@ spec:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-{{ .Values.zookeeper.customTools.restore.component }}"
         image: "{{ .Values.images.zookeeper.customTools.restore.repository }}:{{ .Values.images.zookeeper.customTools.restore.tag }}"
         imagePullPolicy: {{ .Values.zookeeper.customTools.restore.pullPolicy }}
+        {{- if .Values.zookeeper.initContainerSecurityContext }}
+        securityContext: {{- toYaml .Values.zookeeper.initContainerSecurityContext | nindent 10 }}
+        {{- end }}
         command: ["sh", "-c"]
         args:
           - >

charts/sn-platform-slim/values.yaml

@@ -639,6 +639,7 @@ zookeeper:
   advanced: {}
   securityContext:
     runAsNonRoot: true
+  initContainerSecurityContext: {}
   tolerations: []
   gracePeriod: 30
   # Resources requests/limits for both init containers and app containers
@@ -888,6 +889,7 @@ bookkeeper:
   annotations: {}
   securityContext:
     runAsNonRoot: true
+  initContainerSecurityContext: {}
   tolerations: []
   gracePeriod: 30
   # The minimum number of seconds for new pods to be ready.

charts/sn-platform/templates/bookkeeper/bookkeeper-cluster.yaml

@@ -364,6 +364,12 @@ spec:
                     env;
                     {{- end }}
                     bin/pulsar-metadata-tool cleanup
+                {{- if .Values.bookkeeper.initContainerSecurityContext }}
+                securityContext: {{- toYaml .Values.bookkeeper.initContainerSecurityContext | nindent 16 }}
+                {{- end }}
+                {{- if .Values.bookkeeper.resources }}
+                resources: {{- toYaml .Values.bookkeeper.resources | nindent 16 }}
+                {{- end }}
                 env:
                 - name: METADATA_TOOL_CONF
                   value: "/pulsar-metadata-tool/conf/pulsar-metadata-tool/pulsar-metadata-tool.properties"

charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml

@@ -71,6 +71,9 @@ spec:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-{{ .Values.zookeeper.customTools.restore.component }}"
         image: "{{ .Values.images.zookeeper.customTools.restore.repository }}:{{ .Values.images.zookeeper.customTools.restore.tag }}"
         imagePullPolicy: {{ .Values.zookeeper.customTools.restore.pullPolicy }}
+        {{- if .Values.zookeeper.initContainerSecurityContext }}
+        securityContext: {{- toYaml .Values.zookeeper.initContainerSecurityContext | nindent 10 }}
+        {{- end }}
         command: ["sh", "-c"]
         args:
           - >

charts/sn-platform/values.yaml

@@ -714,6 +714,7 @@ zookeeper:
   advanced: {}
   securityContext:
     runAsNonRoot: true
+  initContainerSecurityContext: {}
   tolerations: []
   gracePeriod: 30
   # Resources requests/limits for both init containers and app containers
@@ -963,6 +964,7 @@ bookkeeper:
   annotations: {}
   securityContext:
     runAsNonRoot: true
+  initContainerSecurityContext: {}
   tolerations: []
   gracePeriod: 30
   # The minimum number of seconds for new pods to be ready.