[pulsar-helm-chart] branch master updated: fix: proxy should not use priviledged port numbers (#356)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
     new 90a26b2  fix: proxy should not use priviledged port numbers (#356)
90a26b2 is described below

commit 90a26b2dc885e0a76e33133cf297f8ac6a402c23
Author: Chris Johnson <chrisjohnso...@hotmail.com>
AuthorDate: Tue Jul 11 00:00:17 2023 -0700

    fix: proxy should not use priviledged port numbers (#356)
    
    * fix: proxy should not use priviledged port numbers
    
    This fixes issue #335
    
    * fix: making the change backward compatible
---
 charts/pulsar/templates/proxy-service.yaml     |  4 ++++
 charts/pulsar/templates/proxy-statefulset.yaml | 12 ++++++------
 charts/pulsar/values.yaml                      |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/charts/pulsar/templates/proxy-service.yaml 
b/charts/pulsar/templates/proxy-service.yaml
index 42d4081..d55ad0d 100644
--- a/charts/pulsar/templates/proxy-service.yaml
+++ b/charts/pulsar/templates/proxy-service.yaml
@@ -37,17 +37,21 @@ spec:
     - name: http
       port: {{ .Values.proxy.ports.http }}
       protocol: TCP
+      targetPort: sts-http
     - name: "{{ .Values.tcpPrefix }}pulsar"
       port: {{ .Values.proxy.ports.pulsar }}
       protocol: TCP
+      targetPort: "sts-{{ .Values.tcpPrefix }}pulsar"
     {{- end }}
     {{- if and .Values.tls.enabled .Values.tls.proxy.enabled }}
     - name: https
       port: {{ .Values.proxy.ports.https }}
       protocol: TCP
+      targetPort: sts-https
     - name: "{{ .Values.tlsPrefix }}pulsarssl"
       port: {{ .Values.proxy.ports.pulsarssl }}
       protocol: TCP
+      targetPort: "sts-{{ .Values.tlsPrefix }}pulsarssl"
     {{- end }}
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
diff --git a/charts/pulsar/templates/proxy-statefulset.yaml 
b/charts/pulsar/templates/proxy-statefulset.yaml
index 84b9c71..77254da 100644
--- a/charts/pulsar/templates/proxy-statefulset.yaml
+++ b/charts/pulsar/templates/proxy-statefulset.yaml
@@ -186,16 +186,16 @@ spec:
           OPTS="${OPTS} -Dlog4j2.formatMsgNoLookups=true" exec bin/pulsar proxy
         ports:
         # prometheus needs to access /metrics endpoint
-        - name: http
-          containerPort: {{ .Values.proxy.ports.http }}
+        - name: sts-http
+          containerPort: {{ .Values.proxy.ports.containerPorts.http }}
         {{- if or (not .Values.tls.enabled) (not .Values.tls.proxy.enabled) }}
-        - name: "{{ .Values.tcpPrefix }}pulsar"
+        - name: "sts-{{ .Values.tcpPrefix }}pulsar"
           containerPort: {{ .Values.proxy.ports.pulsar }}
         {{- end }}
         {{- if and (.Values.tls.enabled) (.Values.tls.proxy.enabled) }}
-        - name: https
-          containerPort: {{ .Values.proxy.ports.https }}
-        - name: "{{ .Values.tlsPrefix }}pulsarssl"
+        - name: sts-https
+          containerPort: {{ .Values.proxy.ports.containerPorts.https }}
+        - name: "sts-{{ .Values.tlsPrefix }}pulsarssl"
           containerPort: {{ .Values.proxy.ports.pulsarssl }}
         {{- end }}
       {{- if and .Values.rbac.enabled .Values.rbac.psp }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index c67512c..e5f621c 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -903,6 +903,9 @@ proxy:
     https: 443
     pulsar: 6650
     pulsarssl: 6651
+    containerPorts:
+      http: 8080
+      https: 8443
   service:
     annotations: {}
     type: LoadBalancer