wip:[nmrkit]-include nmr-respredict &

nmr-converter in deployment.

charts/nmrkit/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/nmrkit/templates/deployment.yaml

@@ -20,6 +20,7 @@ spec:
       labels:
         {{- include "nmrkit.selectorLabels" . | nindent 8 }}
     spec:
+      shareProcessNamespace: true
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -49,17 +50,35 @@ spec:
             initialDelaySeconds: 40  # Delay before starting the probe
             periodSeconds: 60        # How often to perform the probe
             failureThreshold: 10
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+          volumeMounts:
+          # - name: app-volume
+          #   mountPath: /code/app
+          - name: docker-socket-volume
+            mountPath: "/var/run/docker.sock"
+          - name: shared-data-volume
+            mountPath: /shared
+        - name: {{ .Values.nmrCli.name }}
+          image: "{{ .Values.nmrCli.repository }}:{{ .Values.nmrCli.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.nmrCli.pullPolicy }}
+          command: ["/bin/sh"]
+          stdin: true
+          tty: true
+        - name: {{ .Values.nmrRespredict.name }}
+          image: "{{ .Values.nmrRespredict.repository }}:{{ .Values.nmrRespredict.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.nmrRespredict.pullPolicy }}
+          command: ["/bin/sh"]
+          stdin: true
+          tty: true
+          volumeMounts:
+            - name: shared-data-volume
+              mountPath: /shared
+      volumes:
+      # - name: app-volume
+      #   hostPath:
+      #     path: ./app
+      - name: docker-socket-volume
+        hostPath:
+          path: /var/run/docker.sock
+      - name: shared-data-volume
+        persistentVolumeClaim:
+          claimName: shared-data-claim

charts/nmrkit/templates/pvc.yml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: shared-data-claim
+  {{- with .Values.storage.pvc.annotations }}
+  annotations:
+    {{- . | toYaml | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if typeIs "string" .Values.storage.pvc.storageClassName }}
+  storageClassName: {{ .Values.storage.pvc.storageClassName | quote }}
+  {{- end }}
+  accessModes:
+    {{- .Values.storage.pvc.accessModes | toYaml | nindent 4 }}
+  resources:
+    requests:
+      storage: {{ .Values.storage.pvc.storage | quote }}

charts/nmrkit/values.yaml

@@ -11,6 +11,18 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: dev-latest
 
+nmr-cli:
+  name: nmr-converter
+  repository: nfdi4chem/nmr-cli
+  pullPolicy: Always
+  tag: dev-latest
+
+nmr-respredict:
+  name: nmr-respredict
+  repository: nfdi4chem/nmr-respredict
+  pullPolicy: Always
+  tag: dev-latest
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""