From ee9e5e7256082812c7a12f83f0d38d952cca8d3e Mon Sep 17 00:00:00 2001
From: Burak Sekili <buraksekili@gmail.com>
Date: Tue, 1 Aug 2023 13:14:24 +0300
Subject: [PATCH] [TT-9523] Add missing volume options in single-dc and
 mdcb-data-plane charts (#79)

* add missing volume and volumemounts in tyk-single-dc

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* add missing volume and volumemounts in mdcb-data-plane and add deprecated mounts

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

---------

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
---
 components/tyk-dashboard/values.yaml |  1 -
 tyk-mdcb-data-plane/values.yaml      | 14 +++++++++++++
 tyk-single-dc/values.yaml            | 30 +++++++++++++++++-----------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/components/tyk-dashboard/values.yaml b/components/tyk-dashboard/values.yaml
index 0f10426a..1e5a5d7d 100644
--- a/components/tyk-dashboard/values.yaml
+++ b/components/tyk-dashboard/values.yaml
@@ -191,7 +191,6 @@ dashboard:
   ##     mountPath: /etc/ssl/certs/ca-certs.crt
   ##     readOnly: true
   extraVolumeMounts: []
-  mounts: []
 
   # Dashboard will only bootstrap if the master bootstrap option is set to true.
   bootstrap: true
diff --git a/tyk-mdcb-data-plane/values.yaml b/tyk-mdcb-data-plane/values.yaml
index bbe43afe..6594600b 100644
--- a/tyk-mdcb-data-plane/values.yaml
+++ b/tyk-mdcb-data-plane/values.yaml
@@ -252,6 +252,20 @@ tyk-gateway:
     # if you want to use a hybrid pump, please change "rpc" to ""
     analyticsConfigType: "rpc"
 
+    ## extraVolumes is a list of volumes to be added to the pod
+    ## extraVolumes:
+    ##   - name: ca-certs
+    ##     secret:
+    ##       defaultMode: 420
+    ##       secretName: ca-certs
+    extraVolumes: []
+
+    ## extraVolumeMounts is a list of volume mounts to be added to the pod
+    ## extraVolumeMounts:
+    ##   - name: ca-certs
+    ##     mountPath: /etc/ssl/certs/ca-certs.crt
+    ##     readOnly: true
+    extraVolumeMounts: []
 
 tyk-pump:
   ## Default values for tyk-pump chart.
diff --git a/tyk-single-dc/values.yaml b/tyk-single-dc/values.yaml
index ae6c5868..d6cfd1ed 100644
--- a/tyk-single-dc/values.yaml
+++ b/tyk-single-dc/values.yaml
@@ -260,11 +260,21 @@ tyk-gateway:
           secretKeyRef:
             name: secrets-tyk-single-dc
             key: APISecret
-    # used to mount files to the gateway containers
-    #  - name: test
-    #    filename: test.txt
-    #    mountPath: /opt/test
-    mounts: []
+
+    ## extraVolumes is a list of volumes to be added to the pod
+    ## extraVolumes:
+    ##   - name: ca-certs
+    ##     secret:
+    ##       defaultMode: 420
+    ##       secretName: ca-certs
+    extraVolumes: []
+
+    ## extraVolumeMounts is a list of volume mounts to be added to the pod
+    ## extraVolumeMounts:
+    ##   - name: ca-certs
+    ##     mountPath: /etc/ssl/certs/ca-certs.crt
+    ##     readOnly: true
+    extraVolumeMounts: []
 
 tyk-pump:
   ## Default values for tyk-pump chart.
@@ -421,12 +431,6 @@ tyk-pump:
     ##     readOnly: true
     extraVolumeMounts: []
 
-    # mounts can be used to mount files on pump container
-    # - name: test
-    #   filename: test.csv
-    #   mountPath: /opt/test
-    mounts: []
-
 tyk-bootstrap:
   # Default values for tyk-bootstrap.
   # This is a YAML-formatted file.
@@ -555,7 +559,9 @@ tyk-dashboard:
     nodeSelector: {}
     tolerations: []
     affinity: {}
+
     extraEnvs: []
+
     ## extraVolumes A list of volumes to be added to the pod
     ## extraVolumes:
     ##   - name: ca-certs
@@ -563,13 +569,13 @@ tyk-dashboard:
     ##       defaultMode: 420
     ##       secretName: ca-certs
     extraVolumes: []
+
     ## extraVolumeMounts A list of volume mounts to be added to the pod
     ## extraVolumeMounts:
     ##   - name: ca-certs
     ##     mountPath: /etc/ssl/certs/ca-certs.crt
     ##     readOnly: true
     extraVolumeMounts: []
-    mounts: []
 
     # Dashboard will only bootstrap if the master bootstrap option is set to true.
     bootstrap: true