Merge pull request #135 from drkfmorton/issue-92

feat: Added support for additional storage engines
edgexfoundry · Oct 19, 2022 · 83b548b · 83b548b
2 parents 9ea5150 + 4329416
commit 83b548b
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 0 deletions.
diff --git a/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-deployment.yaml b/deployment/helm/templates/edgex-appservice-rules/edgex-app-rules-engine-deployment.yaml
@@ -19,6 +19,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.appservice.rules}}

diff --git a/deployment/helm/templates/edgex-consul/edgex-consul-deployment.yaml b/deployment/helm/templates/edgex-consul/edgex-consul-deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.consul}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.consul}}

diff --git a/deployment/helm/templates/edgex-core-command/edgex-core-command-deployment.yaml b/deployment/helm/templates/edgex-core-command/edgex-core-command-deployment.yaml
@@ -20,6 +20,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.core.command}}

diff --git a/deployment/helm/templates/edgex-core-data/edgex-core-data-deployment.yaml b/deployment/helm/templates/edgex-core-data/edgex-core-data-deployment.yaml
@@ -20,6 +20,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.core.data}}

diff --git a/deployment/helm/templates/edgex-device-rest/edgex-device-rest-deployment.yaml b/deployment/helm/templates/edgex-device-rest/edgex-device-rest-deployment.yaml
@@ -20,6 +20,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.device.rest}}

diff --git a/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-deployment.yaml b/deployment/helm/templates/edgex-device-virtual/edgex-device-virtual-deployment.yaml
@@ -20,6 +20,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.device.virtual}}

diff --git a/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-deployment.yaml b/deployment/helm/templates/edgex-ekuiper/edgex-ekuiper-deployment.yaml
@@ -19,6 +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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.bootstrapper}}
+              topologyKey: "kubernetes.io/hostname"
+      {{- end}}
       automountServiceAccountToken: false
       initContainers:
       - name: prep-volumes

diff --git a/deployment/helm/templates/edgex-metadata/edgex-core-metadata-deployment.yaml b/deployment/helm/templates/edgex-metadata/edgex-core-metadata-deployment.yaml
@@ -20,6 +20,15 @@ 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)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.core.metadata}}

diff --git a/deployment/helm/templates/edgex-redis/edgex-redis-deployment.yaml b/deployment/helm/templates/edgex-redis/edgex-redis-deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.redis}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.redis}}

diff --git a/...mplates/edgex-security-secretstore-setup/edgex-security-secretstore-setup-deployment.yaml b/...mplates/edgex-security-secretstore-setup/edgex-security-secretstore-setup-deployment.yaml
@@ -21,6 +21,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.secretstoresetup}}
     spec:
+      {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.bootstrapper}}
+              topologyKey: "kubernetes.io/hostname"
+      {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.secretstoresetup}}

diff --git a/...nt/helm/templates/edgex-support-notifications/edgex-support-notifications-deployment.yaml b/...nt/helm/templates/edgex-support-notifications/edgex-support-notifications-deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.support.notifications}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.support.notifications}}

diff --git a/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-deployment.yaml b/deployment/helm/templates/edgex-support-scheduler/edgex-support-scheduler-deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.support.scheduler}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.support.scheduler}}

diff --git a/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-deployment.yaml b/deployment/helm/templates/edgex-system/edgex-sys-mgmt-agent-deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.system}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.secretstoresetup}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       containers:
       - name: {{.Values.edgex.app.system}}

diff --git a/deployment/helm/templates/edgex-vault/edgex-vault-deployment.yaml b/deployment/helm/templates/edgex-vault/edgex-vault-deployment.yaml
@@ -21,6 +21,15 @@ spec:
       labels:
         org.edgexfoundry.service: {{.Values.edgex.app.vault}}
     spec:
+    {{- if and (eq .Values.edgex.security.enabled true) (eq .Values.edgex.storage.isLocal true)}}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  org.edgexfoundry.service: {{ .Values.edgex.app.bootstrapper}}
+              topologyKey: "kubernetes.io/hostname"
+    {{- end}}
       automountServiceAccountToken: false
       initContainers:
       - name: prep-volumes

diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -306,4 +306,7 @@ edgex:
 
   storage:
     className: ""
+    # 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