From 3c45ec0f700a37e78f95976b545b4611e34d00eb Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Fri, 8 Jul 2022 18:10:39 +0200
Subject: [PATCH] fix(helm): adding kafka-ssl volumes to sink/storage

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/sink/templates/deployment.yaml  |  9 +++++++++
 scripts/helmcharts/openreplay/charts/sink/values.yaml | 11 +++++++++++
 .../charts/storage/templates/deployment.yaml          |  9 +++++++++
 .../helmcharts/openreplay/charts/storage/values.yaml  | 11 +++++++++++
 4 files changed, 40 insertions(+)

diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
index ced1ee0c5..cf1ba1f17 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
@@ -59,6 +59,9 @@ spec:
           volumeMounts:
           - name: datadir
             mountPath: /mnt/efs
+          {{- with .Values.persistence.mounts  }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
       {{- if eq .Values.pvc.name "hostPath" }}
       volumes:
       - name: datadir
@@ -66,11 +69,17 @@ spec:
           # Ensure the file directory is created.
           path: {{ .Values.pvc.hostMountPath }}
           type: DirectoryOrCreate
+      {{- with .Values.persistence.volumes  }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- else }}
       volumes:
       - name: datadir
         persistentVolumeClaim:
           claimName: {{ .Values.pvc.name }}
+      {{- with .Values.persistence.volumes  }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/scripts/helmcharts/openreplay/charts/sink/values.yaml b/scripts/helmcharts/openreplay/charts/sink/values.yaml
index 26ef4367e..91673c981 100644
--- a/scripts/helmcharts/openreplay/charts/sink/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/values.yaml
@@ -85,6 +85,17 @@ pvc:
   name: hostPath
   hostMountPath: /openreplay/storage/nfs
 
+persistence: {}
+  # # Spec of spec.template.spec.containers[*].volumeMounts
+  # mounts:
+  # - name: kafka-ssl
+  #   mountPath: /opt/kafka/ssl
+  # # Spec of spec.template.spec.volumes
+  # volumes:
+  # - name: kafka-ssl
+  #   secret:
+  #     secretName: kafka-ssl
+
 nodeSelector: {}
 
 tolerations: []
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
index b36c06c94..448569ff1 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
@@ -73,8 +73,14 @@ spec:
           volumeMounts:
           - name: datadir
             mountPath: /mnt/efs
+          {{- with .Values.persistence.mounts  }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
       {{- if eq .Values.pvc.name "hostPath" }}
       volumes:
+      {{- with .Values.persistence.volumes  }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: datadir
         hostPath:
           # Ensure the file directory is created.
@@ -82,6 +88,9 @@ spec:
           type: DirectoryOrCreate
       {{- else }}
       volumes:
+      {{- with .Values.persistence.volumes  }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       - name: datadir
         persistentVolumeClaim:
           claimName: {{ .Values.pvc.name }}
diff --git a/scripts/helmcharts/openreplay/charts/storage/values.yaml b/scripts/helmcharts/openreplay/charts/storage/values.yaml
index d82614693..b6072de3f 100644
--- a/scripts/helmcharts/openreplay/charts/storage/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/values.yaml
@@ -86,6 +86,17 @@ pvc:
   name: hostPath
   hostMountPath: /openreplay/storage/nfs
 
+persistence: {}
+  # # Spec of spec.template.spec.containers[*].volumeMounts
+  # mounts:
+  # - name: kafka-ssl
+  #   mountPath: /opt/kafka/ssl
+  # # Spec of spec.template.spec.volumes
+  # volumes:
+  # - name: kafka-ssl
+  #   secret:
+  #     secretName: kafka-ssl
+
 nodeSelector: {}
 
 tolerations: []