From 4b445e0bea08065e2513bc576a9711817ccc623b Mon Sep 17 00:00:00 2001
From: Doug Baggett <douglasbaggett@gmail.com>
Date: Fri, 22 Mar 2024 13:26:48 -0700
Subject: [PATCH] pulsar-manager adding support for existing secret

---
 charts/pulsar/templates/pulsar-manager-admin-secret.yaml  | 2 +-
 .../templates/pulsar-manager-cluster-initialize.yaml      | 8 ++++++++
 charts/pulsar/templates/pulsar-manager-statefulset.yaml   | 8 ++++++++
 charts/pulsar/values.yaml                                 | 7 +++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 charts/pulsar/templates/pulsar-manager-admin-secret.yaml
 mode change 100644 => 100755 charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
 mode change 100644 => 100755 charts/pulsar/templates/pulsar-manager-statefulset.yaml
 mode change 100644 => 100755 charts/pulsar/values.yaml

diff --git a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
old mode 100644
new mode 100755
index 8d20b269..fbee9b2d
--- a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
+++ b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-{{- if .Values.components.pulsar_manager }}
+{{- if and .Values.components.pulsar_manager ( not .Values.pulsar_manager.admin.existingSecret ) }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
old mode 100644
new mode 100755
index 419391fe..4d44e77d
--- a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
+++ b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
@@ -151,12 +151,20 @@ spec:
             - name: USERNAME
               valueFrom:
                 secretKeyRef:
+                  {{- if .Values.pulsar_manager.admin.existingSecret }}
+                  name: {{ .Values.pulsar_manager.admin.existingSecret | quote }}
+                  {{- else }}
                   name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret"
+                  {{- end }}
                   key: UI_USERNAME
             - name: PASSWORD
               valueFrom:
                 secretKeyRef:
+                  {{- if .Values.pulsar_manager.admin.existingSecret }}
+                  name: {{ .Values.pulsar_manager.admin.existingSecret | quote }}
+                  {{- else }}
                   name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret"
+                  {{- end }}
                   key: UI_PASSWORD
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/pulsar/templates/pulsar-manager-statefulset.yaml b/charts/pulsar/templates/pulsar-manager-statefulset.yaml
old mode 100644
new mode 100755
index 62ee59e7..dbb2b1f6
--- a/charts/pulsar/templates/pulsar-manager-statefulset.yaml
+++ b/charts/pulsar/templates/pulsar-manager-statefulset.yaml
@@ -84,12 +84,20 @@ spec:
           - name: USERNAME
             valueFrom:
               secretKeyRef:
+                {{- if .Values.pulsar_manager.admin.existingSecret }}
+                name: {{ .Values.pulsar_manager.admin.existingSecret | quote }}
+                {{- else }}
                 name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret"
+                {{- end }}
                 key: DB_USERNAME
           - name: PASSWORD
             valueFrom:
               secretKeyRef:
+                {{- if .Values.pulsar_manager.admin.existingSecret }}
+                name: {{ .Values.pulsar_manager.admin.existingSecret | quote }}
+                {{- else }}
                 name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret"
+                {{- end }}
                 key: DB_PASSWORD
           - name: PULSAR_MANAGER_OPTS
             value: "$(PULSAR_MANAGER_OPTS) -Dlog4j2.formatMsgNoLookups=true"
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
old mode 100644
new mode 100755
index f64c050b..329a8c7a
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -1315,6 +1315,13 @@ pulsar_manager:
   ## And decode any key by using:
   ## kubectl get secret -l component=pulsar-manager -o=jsonpath="{.items[0].data.UI_PASSWORD}" | base64 --decode
   admin:
+    ## Setting a value at existingSecret disables automatic creation of the secret for pulsar_manager admin credentials and instead uses an existing secret to initialize pulsar-manager
+    ## The existing secret should have the following keys:
+    ## DB_PASSWORD: <database password>
+    ## DB_USERNAME: <database username>
+    ## UI_PASSWORD: <UI password>
+    ## UI_USERNAME: <UI username>
+    existingSecret: ""
     ui_username: "pulsar"
     ui_password: ""  # leave empty for random password
     db_username: "pulsar"