Merge pull request #136 from drkfmorton/issue-92

feat: Added support for additonal storage engines
edgexfoundry · Oct 24, 2022 · 49b4f69 · 49b4f69
2 parents 83b548b + 5003970
commit 49b4f69
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 22 deletions.
diff --git a/deployment/helm/templates/edgex-pv.yaml b/deployment/helm/templates/edgex-pv.yaml
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+  {{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -14,10 +15,12 @@ spec:
   capacity:
     storage: 500Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-consul-config"
+{{- end}}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -30,10 +33,12 @@ spec:
   capacity:
     storage: 500Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-consul-data"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -46,10 +51,12 @@ spec:
   capacity:
     storage: 1Gi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-db"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -62,11 +69,13 @@ spec:
   capacity:
     storage: 128Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-kuiper-data"
+{{- end }}
 {{- if .Values.edgex.security.enabled }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -79,10 +88,12 @@ spec:
   capacity:
     storage: 8Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/tmp/edgex/secrets"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -95,10 +106,12 @@ spec:
   capacity:
     storage: 128Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-init-volume"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -111,10 +124,12 @@ spec:
   capacity:
     storage: 1Gi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-vault-data"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -127,10 +142,12 @@ spec:
   capacity:
     storage: 1Gi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-vault-logs"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -143,10 +160,12 @@ spec:
   capacity:
     storage: 8Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-vault-config"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -159,10 +178,12 @@ spec:
   capacity:
     storage: 8Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-redis-config"
+{{- end }}
 ---
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -175,7 +196,8 @@ spec:
   capacity:
     storage: 8Mi
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   hostPath:
     path: "/mnt/edgex-consul-acl-token"
 {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/edgex-pvc.yaml b/deployment/helm/templates/edgex-pvc.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -21,7 +21,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -33,7 +33,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 512Mi
@@ -45,7 +45,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -58,7 +58,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 8Mi
@@ -70,7 +70,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -82,7 +82,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -94,7 +94,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 128Mi
@@ -106,7 +106,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 8Mi
@@ -118,7 +118,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 8Mi
@@ -130,7 +130,7 @@ metadata:
 spec:
   storageClassName: "{{.Values.edgex.storage.className}}"
   accessModes:
-  - ReadWriteMany
+  - ReadWriteOnce
   resources:
     requests:
       storage: 8Mi

diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -309,4 +309,5 @@ edgex:
     # Set "isLocal" to true when volumes storage is local, where volume mount is not accessible to remote host.
     # This value is used to configure pod affinity.
     isLocal: true
+    useHostPath: true