feat: add extraArgs for detector to support tls-auth (#1124)

* feat: add extraArgs for detector Signed-off-by: ericsyh <[email protected]> * apply to sn-platform chart Signed-off-by: ericsyh <[email protected]> * update examples Signed-off-by: ericsyh <[email protected]> --------- Signed-off-by: ericsyh <[email protected]> (cherry picked from commit 58076fb)
streamnative · Nov 10, 2023 · 8471060 · 8471060
1 parent aba3187
commit 8471060
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml
@@ -109,9 +109,20 @@ spec:
         image: "{{ .Values.images.pulsar_detector.repository }}:{{ .Values.images.pulsar_detector.tag }}"
         imagePullPolicy: {{ .Values.images.pulsar_detector.pullPolicy }}
         command: ["sh", "-c"]
+        {{- if .Values.pulsar_detector.extraArgs }}
         args:
         - >
-          bin/pulsar-detector -service-url {{ template "pulsar.detector.serviceUrl" . }} -webservice-url {{ template "pulsar.detector.webServiceUrl" . }} {{- if .Values.auth.authentication.enabled }} -auth-plugin token -auth-params "{\"token\":\"$brokerClientAuthenticationParameters\"}" {{- end }} {{- if .Values.pulsar_detector.extraArgs }} {{.Values.pulsar_detector.extraArgs }} {{- end }};
+          bin/pulsar-detector \
+          {{- range $key, $value := .Values.pulsar_detector.extraArgs }}
+          -{{ $key }} {{ $value }} \
+          {{- end }}
+          -service-url {{ template "pulsar.detector.serviceUrl" . }} \
+          -webservice-url {{ template "pulsar.detector.webServiceUrl" . }}};
+        {{- else }}
+        args:
+        - >
+          bin/pulsar-detector -service-url {{ template "pulsar.detector.serviceUrl" . }} -webservice-url {{ template "pulsar.detector.webServiceUrl" . }} {{- if .Values.auth.authentication.enabled }} -auth-plugin token -auth-params "{\"token\":\"$brokerClientAuthenticationParameters\"}" {{- end }};
+        {{- end }}
         {{- if .Values.pulsar_detector.resources }}
         resources: {{- toYaml .Values.pulsar_detector.resources | nindent 10 }}
         {{- end }}

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -1403,6 +1403,11 @@ pulsar_detector:
   extraVolumes: []
   extraVolumeMounts: []
   extraEnv: []
+  ## Additional pulsar_detector container arguments
+  extraArgs: {}
+    # Configure the tls auth for detector
+    # auth-plugin: "tls"
+    # auth-params: "{\"tlsCertFile\":\"/pulsar/certs/pulsar-detector/tls.crt\",\"tlsKeyFile\":\"/pulsar/certs/pulsar-detector/tls.key\"}"
   ## Proxy service
   ## templates/pulsar-detector-service.yaml
   ##

diff --git a/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml
@@ -109,9 +109,20 @@ spec:
         image: "{{ .Values.images.pulsar_detector.repository }}:{{ .Values.images.pulsar_detector.tag }}"
         imagePullPolicy: {{ .Values.images.pulsar_detector.pullPolicy }}
         command: ["sh", "-c"]
+        {{- if .Values.pulsar_detector.extraArgs }}
         args:
         - >
-          bin/pulsar-detector -service-url {{ template "pulsar.detector.serviceUrl" . }} -webservice-url {{ template "pulsar.detector.webServiceUrl" . }} {{- if .Values.auth.authentication.enabled }} -auth-plugin token -auth-params "{\"token\":\"$brokerClientAuthenticationParameters\"}" {{- end }} {{- if .Values.pulsar_detector.extraArgs }} {{.Values.pulsar_detector.extraArgs }} {{- end }};
+          bin/pulsar-detector \
+          {{- range $key, $value := .Values.pulsar_detector.extraArgs }}
+          -{{ $key }} {{ $value }} \
+          {{- end }}
+          -service-url {{ template "pulsar.detector.serviceUrl" . }} \
+          -webservice-url {{ template "pulsar.detector.webServiceUrl" . }}};
+        {{- else }}
+        args:
+        - >
+          bin/pulsar-detector -service-url {{ template "pulsar.detector.serviceUrl" . }} -webservice-url {{ template "pulsar.detector.webServiceUrl" . }} {{- if .Values.auth.authentication.enabled }} -auth-plugin token -auth-params "{\"token\":\"$brokerClientAuthenticationParameters\"}" {{- end }};
+        {{- end }}
         {{- if .Values.pulsar_detector.resources }}
         resources: {{- toYaml .Values.pulsar_detector.resources | nindent 10 }}
         {{- end }}

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -1478,6 +1478,11 @@ pulsar_detector:
   extraVolumes: []
   extraVolumeMounts: []
   extraEnv: []
+  ## Additional pulsar_detector container arguments
+  extraArgs: {}
+    # Configure the tls auth for detector
+    # auth-plugin: "tls"
+    # auth-params: "{\"tlsCertFile\":\"/pulsar/certs/pulsar-detector/tls.crt\",\"tlsKeyFile\":\"/pulsar/certs/pulsar-detector/tls.key\"}"
   ## Proxy service
   ## templates/pulsar-detector-service.yaml
   ##