Added support for ephemeral volumes

gimlet-io · Jan 8, 2025 · 1d1ccb5 · 1d1ccb5
1 parent e041bb4
commit 1d1ccb5
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 15 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ type: library
 # 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: 0.7.0
+version: 0.8.0
diff --git a/charts/common/templates/_pvc.yaml b/charts/common/templates/_pvc.yaml
@@ -1,6 +1,6 @@
 {{- define "common.pvc.tpl" -}}
 {{- range .Values.volumes }}
-{{- if not (or .existingClaim .hostPath .fileName .emptyDir .existingConfigMap) }}
+{{- if not (or .existingClaim .hostPath .fileName .emptyDir .existingConfigMap .ephemeral) }}
 {{- $robustName := include "common.robustName" $.Release.Name }}
 ---
 apiVersion: v1
@@ -13,14 +13,7 @@ metadata:
     {{- toYaml .pvcAnnotations | nindent 4 }}
   {{- end }} 
 spec:
-  accessModes:
-    - {{ .accessMode | default "ReadWriteOnce" }}
-  {{- if .storageClass }}
-  storageClassName: {{ .storageClass }}
-  {{- end }}
-  resources:
-    requests:
-      storage: {{ .size | default "1Gi" }}
+  {{- include "common.volumeClaimSpec.tpl" . | nindent 2 }}
 {{- end }}
 {{- end }}
 {{- end -}}
diff --git a/charts/common/templates/_volumeSpec.yaml b/charts/common/templates/_volumeSpec.yaml
@@ -0,0 +1,13 @@
+{{- define "common.volumeClaimSpec.tpl" -}}
+accessModes:
+  - {{ .accessMode | default "ReadWriteOnce" }}
+{{- with .storageClass }}
+storageClassName: {{ . }}
+{{- end }}
+resources:
+  requests:
+    storage: {{ .size | default "1Gi" }}
+{{- with .volumeMode }}
+volumeMode: {{ . }}
+{{- end }}
+{{- end -}}
diff --git a/charts/common/templates/_volumesRef.yaml b/charts/common/templates/_volumesRef.yaml
@@ -20,6 +20,11 @@ volumes:
       {{- if .hostPath.type }}
       type: {{ .hostPath.type }}
       {{- end }}
+    {{- else if .ephemeral }}
+    ephemeral:
+      volumeClaimTemplate:
+        spec:
+          {{- include "common.volumeClaimSpec.tpl" . | nindent 10 }}
     {{- else }}
     persistentVolumeClaim:
       {{- if .existingClaim }}

diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.7.0
-digest: sha256:a97ffdc0ab67ba57b6fb03ab3f98bbbc488f0630f2160b75e937c27d19a2fa08
-generated: "2024-09-09T08:36:50.067911383Z"
+  version: 0.8.0
+digest: sha256:ffc064a8d35b9d9d6e48490b41d0caef00096b0c8f9d1b773dfd9380efdff440
+generated: "2025-01-08T18:33:43.774360305+01:00"
diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
@@ -15,9 +15,9 @@ 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: 0.74.0
+version: 0.75.0
 
 dependencies:
   - name: common
-    version: 0.7.0
+    version: 0.8.0
     repository: file://../common
diff --git a/charts/onechart/charts/common-0.7.0.tgz b/charts/onechart/charts/common-0.7.0.tgz
diff --git a/charts/onechart/charts/common-0.8.0.tgz b/charts/onechart/charts/common-0.8.0.tgz