wip(charts): dataMount -> dataSubPath [pack]

kalisio · Feb 4, 2022 · 7d4c27c · 7d4c27c
1 parent c82d101
commit 7d4c27c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 20 deletions.
diff --git a/charts/k2/templates/deployment.yaml b/charts/k2/templates/deployment.yaml
@@ -34,8 +34,8 @@ spec:
             - mountPath: /mbtiles
               readOnly: true
               name: k2-data
-              {{- if .Values.dataMount }}
-              {{- include "common.tplvalues.render" ( dict "value" .Values.dataMount "context" $ ) | nindent 14 }}
+              {{- if .Values.dataSubPath }}
+              subPath: {{ include "common.tplvalues.render" ( dict "value" .Values.dataSubPath "context" $ ) }}
               {{- end }}
           livenessProbe:
             httpGet:

diff --git a/charts/k2/values.yaml b/charts/k2/values.yaml
@@ -19,9 +19,8 @@ env:
   # debug specifies the list of namespaces to enable debug output
   debug: ""
 
-# dataMount is additionnal keys added to the container's data volume mount
-dataMount: {}
-#  subPath: "tileservergl_data"
+# dataSubPath is the subpath in the the dataVolume to mount
+dataSubPath: ""
 
 # dataVolume is the specification for the volume where the data lies
 dataVolume: {}

diff --git a/charts/mapcache/templates/deployment.yaml b/charts/mapcache/templates/deployment.yaml
@@ -45,8 +45,8 @@ spec:
               name: mapcache-config
             - mountPath: /mnt/data
               name: mapcache-data
-              {{- if .Values.dataMount }}
-              {{- include "common.tplvalues.render" ( dict "value" .Values.dataMount "context" $ ) | nindent 14 }}
+              {{- if .Values.dataSubPath }}
+              subPath: {{ include "common.tplvalues.render" ( dict "value" .Values.dataSubPath "context" $ ) }}
               {{- end }}
       volumes:
         - name: mapcache-config

diff --git a/charts/mapcache/values.yaml b/charts/mapcache/values.yaml
@@ -28,9 +28,8 @@ configVolume: {}
 #  configMap:
 #    name: '{{ include "common.names.fullname" $ }}-config'
 
-# dataMount is additionnal keys added to the container's data volume mount
-dataMount: {}
-#  subPath: "mapserver_data"
+# dataSubPath is the subpath in the the dataVolume to mount
+dataSubPath: ""
 
 # dataVolume is the specification for the volume where the data lies
 dataVolume: {}

diff --git a/charts/mapserver/templates/deployment.yaml b/charts/mapserver/templates/deployment.yaml
@@ -46,8 +46,8 @@ spec:
             - mountPath: /mnt/data
               readOnly: true
               name: mapserver-data
-              {{- if .Values.dataMount }}
-              {{- include "common.tplvalues.render" ( dict "value" .Values.dataMount "context" $ ) | nindent 14 }}
+              {{- if .Values.dataSubPath }}
+              subPath: {{ include "common.tplvalues.render" ( dict "value" .Values.dataSubPath "context" $ ) }}
               {{- end }}
       volumes:
         - name: mapserver-config

diff --git a/charts/mapserver/values.yaml b/charts/mapserver/values.yaml
@@ -28,9 +28,8 @@ configVolume: {}
 #  configMap:
 #    name: '{{ include "common.names.fullname" $ }}-config'
 
-# dataMount is additionnal keys added to the container's data volume mount
-dataMount: {}
-#  subPath: "mapserver_data"
+# dataSubPath is the subpath in the the dataVolume to mount
+dataSubPath: ""
 
 # dataVolume is the specification for the volume where the data lies
 dataVolume: {}

diff --git a/charts/tileservergl/templates/deployment.yaml b/charts/tileservergl/templates/deployment.yaml
@@ -46,8 +46,8 @@ spec:
             - mountPath: /mbtiles
               readOnly: true
               name: tileservergl-data
-              {{- if .Values.dataMount }}
-              {{- include "common.tplvalues.render" ( dict "value" .Values.dataMount "context" $ ) | nindent 14 }}
+              {{- if .Values.dataSubPath }}
+              subPath: {{ include "common.tplvalues.render" ( dict "value" .Values.dataSubPath "context" $ ) }}
               {{- end }}
       volumes:
         - name: tileservergl-config

diff --git a/charts/tileservergl/values.yaml b/charts/tileservergl/values.yaml
@@ -31,9 +31,8 @@ configVolume: {}
 #  configMap:
 #    name: '{{ include "common.names.fullname" $ }}-config'
 
-# dataMount is additionnal keys added to the container's data volume mount
-dataMount: {}
-#  subPath: "tileservergl_data"
+# dataSubPath is the subpath in the the dataVolume to mount
+dataSubPath: ""
 
 # dataVolume is the specification for the volume where the data lies
 dataVolume: {}