From e2c16efcfa7a61ab27280a4ced4f886ebe03c6c0 Mon Sep 17 00:00:00 2001
From: Etash Singh <etashsingh29@gmail.com>
Date: Mon, 12 Oct 2020 15:12:47 +0530
Subject: [PATCH] [incubator/rundeck] Make "data" volume configurable from
 values file. (#23795)

* Updated new image

Signed-off-by: Etash Singh <etash.singh@hpe.com>

* Configurable mount path for data volume

Signed-off-by: Etash Singh <etash.singh@hpe.com>

* Updated chart version

Signed-off-by: Etash Singh <etash.singh@hpe.com>

* Updated deployment.yaml

Signed-off-by: Etash Singh <etash.singh@hpe.com>

Co-authored-by: Etash Singh <etash.singh@hpe.com>
---
 incubator/rundeck/Chart.yaml                | 2 +-
 incubator/rundeck/templates/deployment.yaml | 8 +++-----
 incubator/rundeck/values.yaml               | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/incubator/rundeck/Chart.yaml b/incubator/rundeck/Chart.yaml
index 804a6923c1..afc4421283 100644
--- a/incubator/rundeck/Chart.yaml
+++ b/incubator/rundeck/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Rundeck chart for Kubernetes
 name: rundeck
 home: https://github.com/rundeck/rundeck
-version: 0.3.3
+version: 0.3.4
 appVersion: 3.2.7
 keywords:
 - rundeck
diff --git a/incubator/rundeck/templates/deployment.yaml b/incubator/rundeck/templates/deployment.yaml
index 23f8e72e18..6ca06887ee 100644
--- a/incubator/rundeck/templates/deployment.yaml
+++ b/incubator/rundeck/templates/deployment.yaml
@@ -81,8 +81,9 @@ spec:
             - name: RUNDECK_LOGGING_STRATEGY
               value: "CONSOLE"
           volumeMounts:
-          - name: data
-            mountPath: /home/rundeck/server/data
+        {{- if .Values.volumeMounts }}
+          {{- toYaml .Values.volumeMounts | nindent 10}}
+        {{- end }}
         {{- if .Values.rundeck.sshSecrets }}
           - name: sshkeys
             mountPath: /home/rundeck/.ssh
@@ -99,9 +100,6 @@ spec:
         {{- if .Values.rundeck.extraConfigSecret }}
           - name: extra-config
             mountPath: /home/rundeck/extra/
-        {{- end }}
-        {{- if .Values.volumeMounts }}
-          {{- toYaml .Values.volumeMounts | nindent 10}}
         {{- end }}
           ports:
             - name: rundeck
diff --git a/incubator/rundeck/values.yaml b/incubator/rundeck/values.yaml
index 55a3aa862a..4afb143f7b 100644
--- a/incubator/rundeck/values.yaml
+++ b/incubator/rundeck/values.yaml
@@ -146,10 +146,10 @@ volumes: ""
   # - name: plugins
   #   emptyDir: {}
 
-# volumeMounts to add to the rundeck container
-volumeMounts: ""
-  # - mountPath: /home/rundeck/libext/
-  #   name: plugins
+# volumeMounts to add to the rundeck container and configurable paths
+volumeMounts:
+  - name: data
+    mountPath: /home/rundeck/server/data
 
 # initContainers can be used to download plugins or customise your rundeck installation
 initContainers: ""