Merge pull request #136 from truenas/NAS-112137

NAS-112137 / 21.10 / Allow memory backed emptyDir volumes for ix-chart

charts/ix-chart/2108.0.0/Chart.yaml → charts/ix-chart/2109.0.0/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2108.0.0
+version: 2109.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/ix-chart/2108.0.0/questions.yaml → charts/ix-chart/2109.0.0/questions.yaml

@@ -391,6 +391,25 @@ questions:
                   type: boolean
                   default: false
 
+  - variable: emptyDirVolumes
+    label: "Memory Backed Volumes"
+    description: "Mount memory based temporary volumes for fast access i.e consuming /dev/shm"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: emptyDirVolume
+          label: "Memory Backed Volume"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path"
+                description: "Path where temporary path will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+
   # Volumes
   - variable: volumes
     label: "Volumes"

test/ix-chart/2108.0.0/templates/_volumes.tpl → charts/ix-chart/2109.0.0/templates/_volumes.tpl

@@ -2,7 +2,7 @@
 Volumes Configuration
 */}}
 {{- define "volumeConfiguration" }}
-{{- if or .Values.ixVolumes .Values.hostPathVolumes }}
+{{- if or .Values.ixVolumes .Values.hostPathVolumes .Values.emptyDirVolumes }}
 volumes:
 {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }}
   - name: ix-host-path-{{ $.Release.Name }}-{{ $index }}
@@ -15,6 +15,11 @@ volumes:
     hostPath:
       path: {{ $hostPathConfiguration.hostPath }}
 {{- end }}
+{{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }}
+  - name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }}
+    emptyDir:
+      medium: Memory
+{{- end }}
 {{- end }}
 {{- end }}
 
@@ -23,7 +28,7 @@ volumes:
 Volume Mounts Configuration
 */}}
 {{- define "volumeMountsConfiguration" }}
-{{- if or .Values.hostPathVolumes .Values.ixVolumes }}
+{{- if or .Values.hostPathVolumes .Values.ixVolumes .Values.emptyDirVolumes }}
 volumeMounts:
   {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }}
   - mountPath: {{ $hostPathConfiguration.mountPath }}
@@ -34,5 +39,9 @@ volumeMounts:
   - mountPath: {{ $hostPathConfiguration.mountPath }}
     name: ix-host-volume-{{ $.Release.Name }}-{{ $hostPathConfiguration.datasetName }}
   {{- end }}
+  {{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }}
+  - mountPath: {{ $emptyDirConfiguration.mountPath }}
+    name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }}
+  {{- end }}
 {{- end }}
 {{- end }}

test/ix-chart/2108.0.0/test_values.yaml → charts/ix-chart/2109.0.0/test_values.yaml

@@ -27,6 +27,7 @@ dnsConfig:
 # Storage related configuration
 hostPathVolumes: []
 volumes: []
+emptyDirVolumes: []
 
 # Probes
 # Liveness Probe

test/ix-chart/2108.0.0/Chart.yaml → test/ix-chart/2109.0.0/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2108.0.0
+version: 2109.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

test/ix-chart/2108.0.0/questions.yaml → test/ix-chart/2109.0.0/questions.yaml

@@ -391,6 +391,25 @@ questions:
                   type: boolean
                   default: false
 
+  - variable: emptyDirVolumes
+    label: "Memory Backed Volumes"
+    description: "Mount memory based temporary volumes for fast access i.e consuming /dev/shm"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: emptyDirVolume
+          label: "Memory Backed Volume"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path"
+                description: "Path where temporary path will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+
   # Volumes
   - variable: volumes
     label: "Volumes"

charts/ix-chart/2108.0.0/templates/_volumes.tpl → test/ix-chart/2109.0.0/templates/_volumes.tpl

@@ -2,7 +2,7 @@
 Volumes Configuration
 */}}
 {{- define "volumeConfiguration" }}
-{{- if or .Values.ixVolumes .Values.hostPathVolumes }}
+{{- if or .Values.ixVolumes .Values.hostPathVolumes .Values.emptyDirVolumes }}
 volumes:
 {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }}
   - name: ix-host-path-{{ $.Release.Name }}-{{ $index }}
@@ -15,6 +15,11 @@ volumes:
     hostPath:
       path: {{ $hostPathConfiguration.hostPath }}
 {{- end }}
+{{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }}
+  - name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }}
+    emptyDir:
+      medium: Memory
+{{- end }}
 {{- end }}
 {{- end }}
 
@@ -23,7 +28,7 @@ volumes:
 Volume Mounts Configuration
 */}}
 {{- define "volumeMountsConfiguration" }}
-{{- if or .Values.hostPathVolumes .Values.ixVolumes }}
+{{- if or .Values.hostPathVolumes .Values.ixVolumes .Values.emptyDirVolumes }}
 volumeMounts:
   {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }}
   - mountPath: {{ $hostPathConfiguration.mountPath }}
@@ -34,5 +39,9 @@ volumeMounts:
   - mountPath: {{ $hostPathConfiguration.mountPath }}
     name: ix-host-volume-{{ $.Release.Name }}-{{ $hostPathConfiguration.datasetName }}
   {{- end }}
+  {{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }}
+  - mountPath: {{ $emptyDirConfiguration.mountPath }}
+    name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }}
+  {{- end }}
 {{- end }}
 {{- end }}

charts/ix-chart/2108.0.0/test_values.yaml → test/ix-chart/2109.0.0/test_values.yaml

@@ -27,6 +27,7 @@ dnsConfig:
 # Storage related configuration
 hostPathVolumes: []
 volumes: []
+emptyDirVolumes: []
 
 # Probes
 # Liveness Probe