feat: added support for shared and non-shared volumes

deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-deployment.yaml

@@ -19,7 +19,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.appservice.rules}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-consul/edgex-consul-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.consul}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-core-command/edgex-core-command-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.core.command}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-core-data/edgex-core-data-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.core.data}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-device-rest/edgex-device-rest-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.device.rest}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.device.virtual}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-deployment.yaml

@@ -19,15 +19,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.ekuiper}}
     spec:
-      {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
                 matchLabels:
                   org.edgexfoundry.service: {{ .Values.edgex.app.bootstrapper}}
               topologyKey: "kubernetes.io/hostname"
-      {{- end}}
+    {{- end}}
       automountServiceAccountToken: false
       initContainers:
       - name: prep-volumes

deployment/helm/templates/edgex-metadata/edgex-core-metadata-deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.core.metadata}}
     spec:
-    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+    {{- if and (eq .Values.edgex.security.enabled true) (or (eq .Values.edgex.storage.sharedVolumesAccessMode "ReadWriteOnce") (eq .Values.edgex.storage.useHostPath true))}}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment/helm/templates/edgex-pv.yaml

@@ -2,20 +2,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-  {{- if .Values.edgex.storage.useHostPath }}
+{{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: edgex-consul-config-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: consul-config
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 500Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-consul-config"
 {{- end}}
@@ -26,14 +26,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-consul-data-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: consul-data
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 500Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-consul-data"
 {{- end }}
@@ -44,14 +44,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-db-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: db-data
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 1Gi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-db"
 {{- end }}
@@ -62,33 +62,32 @@ kind: PersistentVolume
 metadata:
   name: edgex-kuiper-data
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: kuiper-data
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 128Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-kuiper-data"
 {{- end }}
-{{- if .Values.edgex.security.enabled }}
 ---
 {{- if .Values.edgex.storage.useHostPath }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: edgex-secrets-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: edgex-secrets
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 8Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.sharedVolumesAccessMode}}
   hostPath:
     path: "/tmp/edgex/secrets"
 {{- end }}
@@ -99,14 +98,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-init-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: edgex-init
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 128Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.sharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-init-volume"
 {{- end }}
@@ -117,14 +116,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-vault-data-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: vault-file
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 1Gi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-vault-data"
 {{- end }}
@@ -135,14 +134,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-vault-logs-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: vault-logs
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 1Gi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-vault-logs"
 {{- end }}
@@ -153,14 +152,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-vault-config-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: vault-config
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 8Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-vault-config"
 {{- end }}
@@ -171,14 +170,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-redis-config-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: redis-config
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 8Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-redis-config"
 {{- end }}
@@ -189,15 +188,14 @@ kind: PersistentVolume
 metadata:
   name: edgex-consul-acl-token-volume
 spec:
-  storageClassName: "{{.Values.edgex.storage.className}}"
+  storageClassName: ""
   claimRef:
     name: consul-acl-token
     namespace: {{ .Release.Namespace }}
   capacity:
     storage: 8Mi
   accessModes:
-    - ReadWriteOnce
+    - {{.Values.edgex.storage.nonSharedVolumesAccessMode}}
   hostPath:
     path: "/mnt/edgex-consul-acl-token"
 {{- end }}
-{{- end }}