From d876a3f442b12118dce20a974bb36f8cfbe17993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 4 Feb 2019 20:44:07 +0100
Subject: [PATCH] Multiple container per pod setup

---
 staging/deployment-backend.yaml | 29 +++++++++++++++++------
 staging/deployment-neo4j.yaml   | 41 ++++++++++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/staging/deployment-backend.yaml b/staging/deployment-backend.yaml
index b3f329ba8..da3c4f148 100644
--- a/staging/deployment-backend.yaml
+++ b/staging/deployment-backend.yaml
@@ -18,7 +18,24 @@
         name: "nitro-backend"
       spec:
         containers:
-        - env:
+        - name: nitro-db-migration-worker
+          image: humanconnection/db-migration-worker:latest
+          imagePullPolicy: Always
+          envFrom:
+          - configMapRef:
+              name: db-migration-worker
+          volumeMounts:
+          - name: secret-volume
+            readOnly: false
+            mountPath: /root/.ssh
+          - name: uploads
+            mountPath: /uploads/
+        - name: nitro-backend
+          image: humanconnection/nitro-backend:latest
+          imagePullPolicy: Always
+          ports:
+          - containerPort: 4000
+          env:
           - name: COMMIT
             value: <BACKEND_COMMIT>
           - name: MOCK
@@ -54,16 +71,14 @@
               configMapKeyRef:
                 name: staging-neo4j
                 key: NEO4J_URI
-          image: humanconnection/nitro-backend:latest
-          name: nitro-backend
-          ports:
-          - containerPort: 4000
-          resources: {}
-          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /nitro-backend/public/uploads
               name: uploads
         volumes:
+        - name: secret-volume
+          secret:
+            secretName: ssh-keys
+            defaultMode: 0400
         - name: uploads
           persistentVolumeClaim:
             claimName: uploads-claim
diff --git a/staging/deployment-neo4j.yaml b/staging/deployment-neo4j.yaml
index 58ca7f24b..957696341 100644
--- a/staging/deployment-neo4j.yaml
+++ b/staging/deployment-neo4j.yaml
@@ -17,7 +17,25 @@
         name: nitro-neo4j
       spec:
         containers:
-        - env:
+        - name: nitro-db-migration-worker
+          image: humanconnection/db-migration-worker:latest
+          imagePullPolicy: Always
+          envFrom:
+          - configMapRef:
+              name: db-migration-worker
+          env:
+          - name: COMMIT
+            value: <BACKEND_COMMIT>
+          volumeMounts:
+          - name: secret-volume
+            readOnly: false
+            mountPath: /root/.ssh
+          - name: mongo-export
+            mountPath: /mongo-export/
+        - name: nitro-neo4j
+          image: humanconnection/neo4j:latest
+          imagePullPolicy: Always
+          env:
           - name: COMMIT
             value: <BACKEND_COMMIT>
           - name: NEO4J_apoc_import_file_enabled
@@ -43,19 +61,19 @@
               configMapKeyRef:
                 name: staging-neo4j
                 key: NEO4J_AUTH
-          image: humanconnection/neo4j:latest
-          name: nitro-neo4j
           ports:
           - containerPort: 7687
           - containerPort: 7474
-          resources: {}
-          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /data/
               name: neo4j-data
             - mountPath: /mongo-export/
               name: mongo-export
         volumes:
+        - name: secret-volume
+          secret:
+            secretName: ssh-keys
+            defaultMode: 0400
         - name: mongo-export
           persistentVolumeClaim:
             claimName: mongo-export-claim
@@ -64,7 +82,6 @@
             claimName: neo4j-data-claim
         restartPolicy: Always
         terminationGracePeriodSeconds: 30
-  status: {}
 ---
   kind: PersistentVolumeClaim
   apiVersion: v1
@@ -77,3 +94,15 @@
     resources:
       requests:
         storage: 4Gi
+---
+  kind: PersistentVolumeClaim
+  apiVersion: v1
+  metadata:
+    name: mongo-export-claim
+    namespace: staging
+  spec:
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 1Gi