From d8f3673bbf9d859c51380ef1fa479da031f2b817 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 19:04:34 +0200
Subject: [PATCH] chore(helm): override the pvc name

---
 .../charts/utilities/templates/efs-cron.yaml     |  6 +++---
 .../openreplay/charts/utilities/values.yaml      | 16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index b74b0cbad..a960ebea4 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -32,17 +32,17 @@ spec:
             - mountPath: /mnt/efs
               name: datadir
           restartPolicy: Never
-          {{- if eq .Values.pvc.name "hostPath" }}
+          {{- if eq .Values.efsCleaner.pvc.name "hostPath" }}
           volumes:
           - name: datadir
             hostPath:
               # Ensure the file directory is created.
-              path: {{ .Values.pvc.hostMountPath }}
+              path: {{ .Values.efsCleaner.pvc.hostMountPath }}
               type: DirectoryOrCreate
           {{- else }}
           volumes:
           - name: datadir
             persistentVolumeClaim:
-              claimName: {{ .Values.pvc.name }}
+              claimName: {{ .Values.efsCleaner.pvc.name }}
           {{- end }}
 
diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index 17caeb5b5..49838d774 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -9,8 +9,13 @@ efsCleaner:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/alpine"
     pullPolicy: Always
     tag: 3.16.1
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  pvc:
+    # This can be either persistentVolumeClaim or hostPath.
+    # In case of pvc, you'll have to provide the pvc name.
+    # For example
+    # name: openreplay-efs
+    name: hostPath
+    hostMountPath: /openreplay/storage/nfs
 
 telemetry:
   # https://crontab.guru/#5_12_*_*_*
@@ -78,10 +83,3 @@ fullnameOverride: "utilities-openreplay"
 # refer: https://crontab.guru/#5_3_*_*_1
 cron: "5 3 * * 1"
 
-pvc:
-  # This can be either persistentVolumeClaim or hostPath.
-  # In case of pvc, you'll have to provide the pvc name.
-  # For example
-  # name: openreplay-efs
-  name: hostPath
-  hostMountPath: /openreplay/storage/nfs