persistent disk charts (#1606)

* fix

* fix

* oops

* fix

* Update values.yaml (#1599)

* feat: adds a persistent disk helm chart to install efs persistent storage (#1578)

* wip

* save progress

* add a pd chart

* fix newlines

---------

Co-authored-by: Mauricio Araujo <[email protected]>

* Add helper to display volumeMounts (#1605)

---------

Co-authored-by: Gilad K <[email protected]>
Co-authored-by: Gilad <[email protected]>
Co-authored-by: d-g-town <[email protected]>
Co-authored-by: Yosef Mihretie <[email protected]>

Author: 5 people

Tiltfile

@@ -84,6 +84,7 @@ local_resource(
   helm cm-push addons/porter-agent local && \
   helm cm-push addons/karpenter local && \
   helm cm-push addons/tailscale-operator local && \
+  helm cm-push addons/persistent-disk local && \
   helm repo update local
   ''',
   deps=[

addons/persistent-disk/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: persistent-disk
+description: A Helm chart for creating a persistent disk via a StorageClass, PV, and PVC, backed by Cloud Provider disks.
+type: application
+version: 0.1.0
+appVersion: "0.1.0"

addons/persistent-disk/templates/persistentvolumeclaim.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.storageClass.efs.enabled -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    porter.run/addon-name: {{ .Release.Name }}
+    porter.run/addon-type: persistent-disk
+    {{- with .Values.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- with .Values.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  accessModes:
+    {{- toYaml .Values.persistentVolumeClaim.accessModes | nindent 4 }}
+  resources:
+    requests:
+      storage: {{ .Values.persistentVolumeClaim.requestStorage }}
+  storageClassName: {{ .Release.Name }}
+{{- end }}

addons/persistent-disk/templates/storageclass.yaml

@@ -0,0 +1,25 @@
+{{- $scName := .Values.storageClass.name | default (printf "pd-sc-%s" .Release.Name) -}}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    porter.run/addon-name: {{ .Release.Name }}
+    porter.run/addon-type: persistent-disk
+    {{- with .Values.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- with .Values.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+{{- if .Values.storageClass.efs.enabled }}
+reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageClass.volumeBindingMode }}
+provisioner: {{ .Values.storageClass.efs.provisioner }}
+parameters:
+  directoryPerms: {{ .Values.storageClass.directoryPerms | quote }}
+  reuseAccessPoint: {{ .Values.storageClass.reuseAccessPoint | quote }}
+  fileSystemId: {{ .Values.storageClass.efs.fileSystemId | quote }}
+  provisioningMode: {{ .Values.storageClass.efs.provisioningMode | quote }}
+{{- end }}

addons/persistent-disk/values.yaml

@@ -0,0 +1,19 @@
+labels: {}
+
+annotations: {}
+
+storageClass:
+  reclaimPolicy: "Retain"
+  volumeBindingMode: "Immediate"
+  directoryPerms: "777"
+  reuseAccessPoint: "true"
+  efs:
+    enabled: true
+    fileSystemId: ""
+    provisioningMode: "efs-ap"
+    provisioner: efs.csi.aws.com
+
+persistentVolumeClaim:
+  requestStorage: "5Gi"
+  accessModes:
+    - ReadWriteMany

applications/job/templates/_helpers.tpl

@@ -102,4 +102,16 @@ For backwards compatibility, this concatenates targets from cloudsql.connectionN
     {{- end -}}
 
 {{- end }}
-{{- end }}
+{{- end }}
+
+{{/*
+Return true if volumeMounts should be rendered in the main container
+
+*/}}
+{{- define "job.shouldRenderVolumeMounts" -}}
+{{- if or .Values.pvc.enabled .Values.multiplePvc.enabled (and .Values.fileSecretMounts .Values.fileSecretMounts.enabled) -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}

applications/job/templates/cronjob.yaml

@@ -169,7 +169,7 @@ spec:
                 {{- end }}
               {{- end }}
               {{- end }}
-              {{ if and .Values.fileSecretMounts .Values.fileSecretMounts.enabled }}
+              {{- if include "job.shouldRenderVolumeMounts" . }}
               volumeMounts:
               {{ range .Values.fileSecretMounts.mounts }}
                 - name: {{ .mountPath }}
@@ -178,7 +178,6 @@ spec:
               {{ end }}
               {{ end }}
               {{ if .Values.pvc.enabled }}
-              volumeMounts:
                 - name: "{{ include "docker-template.fullname" . }}-storage"
                   mountPath: {{ .Values.pvc.mountPath }}
               {{ end }}