chore: add ephemeral vol and pvc as default or provide pvc name from …

…values
michalziobro · Feb 8, 2023 · 58d5677 · 58d5677
1 parent c3742c8
commit 58d5677
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -23,7 +23,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: 1.0.2
+version: 1.0.3
 
 # 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

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # generic-microservice-helm
 
-![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 Generic helm chart for Energy Web Foundation microservices
 
@@ -45,6 +45,10 @@ pre-commit install-hooks
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | container.ports.http | int | `80` |  |
 | deploymentStrategy | string | `"RollingUpdate"` |  |
+| emptyDir.enabled | bool | `false` |  |
+| emptyDir.mountPath | string | `"/cache"` |  |
+| emptyDir.name | string | `"shared-vol"` |  |
+| emptyDir.sizeLimit | string | `"500Mi"` |  |
 | env | object | `{}` |  |
 | extraLabels | object | `{}` | Extra lables to be added to all resources |
 | fullnameOverride | string | `""` |  |
@@ -75,8 +79,10 @@ pre-commit install-hooks
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
 | pvc.accessModes | string | `"ReadWriteOnce"` |  |
+| pvc.claimname | string | `"pv-claim"` |  |
 | pvc.enabled | bool | `false` |  |
 | pvc.mountPath | string | `"/tmp"` |  |
+| pvc.name | string | `"pvc-vol"` |  |
 | pvc.storage | string | `"20Gi"` |  |
 | pvc.storageClassName | string | `"default"` |  |
 | readinessProbe.enabled | bool | `false` |  |

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -91,17 +91,28 @@ spec:
           {{- if .Values.sidecars }}
           {{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 8 }}
           {{- end }}
+          {{- if .Values.emptyDir.enabled }}
+          volumeMounts:
+            - mountPath: {{ .Values.emptyDir.mountPath }}
+              name: {{ .Values.emptyDir.name | default (printf "%s-volume" (include "microservice.fullname" .)) }}
+          {{- end }}
           {{- if .Values.pvc.enabled }}
           volumeMounts:
             - mountPath: {{ .Values.pvc.mountPath }}
-              name: {{ include "microservice.fullname" . }}-volume
+              name: {{ .Values.pvc.name | default (printf "%s-volume" (include "microservice.fullname" .)) }}
           {{- end }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- if .Values.emptyDir.enabled }}
+      volumes:
+        - name: {{ .Values.emptyDir.name | default (printf "%s-volume" (include "microservice.fullname" .)) }}
+          emptyDir:
+            sizeLimit: {{ .Values.emptyDir.sizeLimit }}
+      {{- end }}
       {{- if .Values.pvc.enabled }}
       volumes:
-        - name: {{ include "microservice.fullname" . }}-volume
+        - name: {{ .Values.pvc.name | default (printf "%s-volume" (include "microservice.fullname" .)) }}
           persistentVolumeClaim:
-            claimName: {{ include "microservice.fullname" . }}-claim
+            claimName: {{ .Values.pvc.claimname | default (printf "%s-claim" (include "microservice.fullname" .)) }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/values.yaml b/values.yaml
@@ -34,11 +34,19 @@ livenessProbe:
 
 pvc:
   enabled: false
+  name: pvc-vol
+  claimname: pv-claim
   accessModes: ReadWriteOnce
   storageClassName: default
   storage: 20Gi
   mountPath: "/tmp"
 
+emptyDir:
+  enabled: false
+  name: shared-vol
+  mountPath: /cache
+  sizeLimit: 500Mi
+
 
 container:
   ports: