Merge pull request eclipse-ditto#1986 from bosch-io/feature/helm-extr…

…a-volumes add possibility to add extra volumes and volume mounts for extending …
beyonnex-io · Jul 22, 2024 · d5f43d0 · d5f43d0
2 parents 8f48e96 + 4d19b16
commit d5f43d0
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 1 deletion.
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.5.10  # chart version is effectively set by release-job
+version: 3.5.11  # chart version is effectively set by release-job
 appVersion: 3.5.10
 keywords:
   - iot-chart

diff --git a/deployment/helm/ditto/templates/connectivity-deployment.yaml b/deployment/helm/ditto/templates/connectivity-deployment.yaml
@@ -324,6 +324,9 @@ spec:
             - name: ditto-log-files-directory
               mountPath: /var/log/ditto
             {{- end }}
+            {{- if .Values.connectivity.extraVolumeMounts }}
+              {{- toYaml .Values.connectivity.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ mulf .Values.connectivity.resources.cpu 1000 }}m
@@ -370,4 +373,7 @@ spec:
             path: /var/log/ditto
             type: DirectoryOrCreate
         {{- end }}
+        {{- if .Values.connectivity.extraVolumes }}
+          {{- toYaml .Values.connectivity.extraVolumes | nindent 8 }}
+        {{- end}}
 {{- end }}
diff --git a/deployment/helm/ditto/templates/gateway-deployment.yaml b/deployment/helm/ditto/templates/gateway-deployment.yaml
@@ -276,6 +276,9 @@ spec:
             - name: ditto-log-files-directory
               mountPath: /var/log/ditto
             {{- end }}
+            {{- if .Values.gateway.extraVolumeMounts }}
+              {{- toYaml .Values.gateway.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ mulf .Values.gateway.resources.cpu 1000 }}m
@@ -322,4 +325,7 @@ spec:
             path: /var/log/ditto
             type: DirectoryOrCreate
         {{- end }}
+        {{- if .Values.gateway.extraVolumes }}
+          {{- toYaml .Values.gateway.extraVolumes | nindent 8 }}
+        {{- end}}
 {{- end }}
diff --git a/deployment/helm/ditto/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml
@@ -311,6 +311,9 @@ spec:
             - name: ditto-log-files-directory
               mountPath: /var/log/ditto
             {{- end }}
+            {{- if .Values.policies.extraVolumeMounts }}
+              {{- toYaml .Values.policies.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ mulf .Values.policies.resources.cpu 1000 }}m
@@ -357,4 +360,7 @@ spec:
             path: /var/log/ditto
             type: DirectoryOrCreate
         {{- end }}
+        {{- if .Values.policies.extraVolumes }}
+          {{- toYaml .Values.policies.extraVolumes | nindent 8 }}
+        {{- end}}
 {{- end }}
diff --git a/deployment/helm/ditto/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml
@@ -315,6 +315,9 @@ spec:
             - name: ditto-log-files-directory
               mountPath: /var/log/ditto
             {{- end }}
+            {{- if .Values.things.extraVolumeMounts }}
+              {{- toYaml .Values.things.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ mulf .Values.things.resources.cpu 1000 }}m
@@ -361,4 +364,7 @@ spec:
             path: /var/log/ditto
             type: DirectoryOrCreate
         {{- end }}
+        {{- if .Values.things.extraVolumes }}
+          {{- toYaml .Values.things.extraVolumes | nindent 8 }}
+        {{- end}}
 {{- end }}
diff --git a/deployment/helm/ditto/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
@@ -303,6 +303,9 @@ spec:
             - name: ditto-log-files-directory
               mountPath: /var/log/ditto
             {{- end }}
+            {{- if .Values.thingsSearch.extraVolumeMounts }}
+              {{- toYaml .Values.thingsSearch.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ mulf .Values.thingsSearch.resources.cpu 1000 }}m
@@ -349,4 +352,7 @@ spec:
             path: /var/log/ditto
             type: DirectoryOrCreate
         {{- end }}
+        {{- if .Values.thingsSearch.extraVolumes }}
+          {{- toYaml .Values.thingsSearch.extraVolumes | nindent 8 }}
+        {{- end}}
 {{- end }}
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
@@ -522,6 +522,14 @@ policies:
   extraEnv:
   # - name: LOG_LEVEL_APPLICATION
   #   value: "DEBUG"
+  extraVolumes:
+  #  - name: policies-extension
+  #    configMap:
+  #      name: policies-extension.jar
+  extraVolumeMounts:
+  #  - name: policies-extension
+  #    mountPath: /opt/ditto/policies-extension.jar
+  #    subPath: policies-extension.jar
   # resources configures the resources available/to use for the policies service
   resources:
     # cpu defines the "required" CPU of a node so that the service is placed there
@@ -755,6 +763,14 @@ things:
   extraEnv:
   # - name: LOG_LEVEL_APPLICATION
   #   value: "DEBUG"
+  extraVolumes:
+  #  - name: things-extension
+  #    configMap:
+  #      name: things-extension.jar
+  extraVolumeMounts:
+  #  - name: things-extension
+  #    mountPath: /opt/ditto/things-extension.jar
+  #    subPath: things-extension.jar
   # resources configures the resources available/to use for the things service
   resources:
     # cpu defines the "required" CPU of a node so that the service is placed there
@@ -1010,6 +1026,14 @@ thingsSearch:
   extraEnv:
   # - name: LOG_LEVEL_APPLICATION
   #   value: "DEBUG"
+  extraVolumes:
+  #  - name: search-extension
+  #    configMap:
+  #      name: search-extension.jar
+  extraVolumeMounts:
+  #  - name: search-extension
+  #    mountPath: /opt/ditto/search-extension.jar
+  #    subPath: search-extension.jar
   # resources configures the resources available/to use for the things search service
   resources:
     # cpu defines the "required" CPU of a node so that the service is placed there
@@ -1225,6 +1249,14 @@ connectivity:
   extraEnv:
   # - name: LOG_LEVEL_APPLICATION
   #   value: "DEBUG"
+  extraVolumes:
+  #  - name: connectivity-extension
+  #    configMap:
+  #      name: connectivity-extension.jar
+  extraVolumeMounts:
+  #  - name: connectivity-extension
+  #    mountPath: /opt/ditto/connectivity-extension.jar
+  #    subPath: connectivity-extension.jar
   # resources configures the resources available/to use for the connectivity service
   resources:
     # cpu defines the "required" CPU of a node so that the service is placed there
@@ -1517,6 +1549,14 @@ gateway:
   extraEnv:
   # - name: LOG_LEVEL_APPLICATION
   #   value: "DEBUG"
+  extraVolumes:
+  #  - name: gatway-extension
+  #    configMap:
+  #      name: gatway-extension.jar
+  extraVolumeMounts:
+  #  - name: gatway-extension
+  #    mountPath: /opt/ditto/gatway-extension.jar
+  #    subPath: gatway-extension.jar
   # resources configures the resources available/to use for the gateway service
   resources:
     # cpu defines the "required" CPU of a node so that the service is placed there