init efs feature

wp-digital · Jun 14, 2023 · 7f9cb55 · 7f9cb55
1 parent e63427a
commit 7f9cb55
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 5 deletions.
diff --git a/charts/wp-project-skeleton/Chart.lock b/charts/wp-project-skeleton/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 2.4.0
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 17.11.3
+  version: 17.11.5
 - name: newrelic-php-agent
   repository: https://wp-digital.github.io/helm-charts
   version: 0.1.1
-digest: sha256:bc26bc5ccbef9fcb39b0ba1cefd0aa89b16ec1f07f87c1c95817008a4389d712
-generated: "2023-05-22T12:16:28.95468+03:00"
+digest: sha256:67c70be5585dd13fed93722645f43cf3ebffdc1b16025c57c58c714d4ae7f521
+generated: "2023-06-14T21:27:13.786563+03:00"
diff --git a/charts/wp-project-skeleton/Chart.yaml b/charts/wp-project-skeleton/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: wp-project-skeleton
 description: A Helm chart to deploy WordPress project.
 type: application
-version: 0.4.0
-appVersion: "0.4.0"
+version: 0.5.0
+appVersion: "0.5.0"
 dependencies:
   - name: common
     version: 2.x.x

diff --git a/charts/wp-project-skeleton/templates/deployment.yaml b/charts/wp-project-skeleton/templates/deployment.yaml
@@ -86,9 +86,18 @@ spec:
               name: {{ .Chart.Name }}-nginx-config
               subPath: default.conf
               readOnly: true
+            {{- if .Values.persistence.fileSystemId }}
+            - mountPath: {{ .Values.persistence.path }}
+              name: {{ .Chart.Name }}-efs
+            {{- end }}
       volumes:
         - name: {{ .Chart.Name }}-data
           emptyDir: {}
         - name: {{ .Chart.Name }}-nginx-config
           configMap:
             name: {{ include "common.names.fullname" . }}-nginx-config
+        {{- if .Values.persistence.fileSystemId }}
+        - name: {{ .Chart.Name }}-efs
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-efc-claim
+        {{- end }}
diff --git a/charts/wp-project-skeleton/templates/pv.yaml b/charts/wp-project-skeleton/templates/pv.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.persistence.fileSystemId }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ include "common.names.fullname" . }}-efs-pv
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+    {{- if .Values.persistence.annotations }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.persistence.annotations "context" $) | nindent 4 }}
+    {{- end }}
+spec:
+  capacity:
+    storage: {{ .Values.persistence.size }}
+  accessModes:
+    - {{ .Values.persistence.accessMode }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass }}
+  {{- end }}
+  {{- if .Values.persistence.reclaimPolicy }}
+  persistentVolumeReclaimPolicy: {{ .Values.persistence.reclaimPolicy }}
+  {{- end }}
+{{- end }}
diff --git a/charts/wp-project-skeleton/templates/pvc.yaml b/charts/wp-project-skeleton/templates/pvc.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.persistence.fileSystemId }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "common.names.fullname" . }}-efs-claim
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.accessMode | quote }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+{{- end }}
diff --git a/charts/wp-project-skeleton/templates/sc.yaml b/charts/wp-project-skeleton/templates/sc.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.persistence.fileSystemId }}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .Values.persistence.storageClass }}
+provisioner: efs.csi.aws.com
+parameters:
+  provisioningMode: efs-ap
+  fileSystemId: {{ .Values.persistence.fileSystemId }}
+  directoryPerms: {{ .Values.persistence.directoryPerms }}
+{{- end }}
diff --git a/charts/wp-project-skeleton/values.yaml b/charts/wp-project-skeleton/values.yaml
@@ -170,3 +170,13 @@ readinessProbe:
   timeoutSeconds: 5
   failureThreshold: 6
   successThreshold: 1
+
+persistence:
+  fileSystemId: ""
+  accessMode: ReadWriteMany
+  size: 2Gi
+  storageClass: ""
+  reclaimPolicy: Retain
+  directoryPerms: "755"
+  annotations: {}
+  path: ""