From 5622b1aa30a6f580fafac2a83df90c848eba5937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 14:21:47 +0200 Subject: [PATCH 1/7] Avoid deletion of entire namespace by accident Yep, that happened to me. I did ``` kubectl delete -f deployment/human-connection ``` and I forgot about the namespace in that folder. Now everything is gone. --- deployment/human-connection/README.md | 2 +- deployment/{human-connection => }/namespace.yaml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename deployment/{human-connection => }/namespace.yaml (100%) diff --git a/deployment/human-connection/README.md b/deployment/human-connection/README.md index cd49fef33..8b30e98d6 100644 --- a/deployment/human-connection/README.md +++ b/deployment/human-connection/README.md @@ -38,7 +38,7 @@ your deployed kubernetes pods. ## Create a namespace ```bash -# in folder deployment/human-connection/ +# in folder deployment/ $ kubectl apply -f namespace.yaml ``` diff --git a/deployment/human-connection/namespace.yaml b/deployment/namespace.yaml similarity index 100% rename from deployment/human-connection/namespace.yaml rename to deployment/namespace.yaml From 95fe115198986b29e8c6a8f29db24718ebb5ec93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 15:01:56 +0200 Subject: [PATCH 2/7] Fix typo --- deployment/legacy-migration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/legacy-migration/README.md b/deployment/legacy-migration/README.md index 8cc7bd746..a5ac40cfc 100644 --- a/deployment/legacy-migration/README.md +++ b/deployment/legacy-migration/README.md @@ -56,7 +56,7 @@ Deploy one-time maintenance-worker pod: ```bash # in deployment/legacy-migration/ -$ kubectl apply -f db-migration-worker.yaml +$ kubectl apply -f maintenance-worker.yaml pod/nitro-maintenance-worker created ``` From 2c8dcaa592af3cf96096c93e0d22883f72097a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 15:08:14 +0200 Subject: [PATCH 3/7] Yet another typo --- deployment/legacy-migration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/legacy-migration/README.md b/deployment/legacy-migration/README.md index a5ac40cfc..7e8b6a205 100644 --- a/deployment/legacy-migration/README.md +++ b/deployment/legacy-migration/README.md @@ -65,7 +65,7 @@ Import legacy database and uploads: ```bash $ kubectl --namespace=human-connection exec -it nitro-maintenance-worker bash $ import_legacy_db -$ import_uploads +$ import_legacy_uploads $ exit ``` From 7cb77c8c8d9cc6739d9eb800ccc98615db9a9285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 15:11:05 +0200 Subject: [PATCH 4/7] Increase volume size for uploads --- deployment/volumes/uploads.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/volumes/uploads.yaml b/deployment/volumes/uploads.yaml index 11a8027e9..2bd64c9ee 100644 --- a/deployment/volumes/uploads.yaml +++ b/deployment/volumes/uploads.yaml @@ -9,4 +9,4 @@ - ReadWriteOnce resources: requests: - storage: 2Gi + storage: 25Gi From e1a113e7e445a2b0f25061178e362f6dda0d86c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 15:16:08 +0200 Subject: [PATCH 5/7] Fix wrong mountpath We're saving the files to /uploads. If the maintenance-worker does not mount the uploads persistent volume there, we don't get persistent files. --- deployment/legacy-migration/maintenance-worker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/legacy-migration/maintenance-worker.yaml b/deployment/legacy-migration/maintenance-worker.yaml index cda17400a..ffda084f6 100644 --- a/deployment/legacy-migration/maintenance-worker.yaml +++ b/deployment/legacy-migration/maintenance-worker.yaml @@ -18,7 +18,7 @@ readOnly: false mountPath: /root/.ssh - name: uploads - mountPath: /nitro-backend/public/uploads + mountPath: /uploads - name: neo4j-data mountPath: /data/ volumes: From a83aad3f606856279f6983680912d91f5db691b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 16:00:45 +0200 Subject: [PATCH 6/7] Fix wrong path in Dockerfile --- deployment/legacy-migration/maintenance-worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/legacy-migration/maintenance-worker/Dockerfile b/deployment/legacy-migration/maintenance-worker/Dockerfile index 1fafce5e8..2db8fc33b 100644 --- a/deployment/legacy-migration/maintenance-worker/Dockerfile +++ b/deployment/legacy-migration/maintenance-worker/Dockerfile @@ -7,5 +7,5 @@ RUN apk upgrade --update RUN apk add --no-cache mongodb-tools openssh nodejs yarn rsync COPY known_hosts /root/.ssh/known_hosts -COPY migration ./migration +COPY migration /migration COPY ./binaries/* /usr/local/bin/ From 58224381a8e980b464d665d4738090133c856000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 16:12:03 +0200 Subject: [PATCH 7/7] Add missing environment var to maintenance-worker --- deployment/legacy-migration/maintenance-worker.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deployment/legacy-migration/maintenance-worker.yaml b/deployment/legacy-migration/maintenance-worker.yaml index ffda084f6..a0f354fc9 100644 --- a/deployment/legacy-migration/maintenance-worker.yaml +++ b/deployment/legacy-migration/maintenance-worker.yaml @@ -8,6 +8,9 @@ containers: - name: nitro-maintenance-worker image: humanconnection/maintenance-worker:latest + env: + - name: NEO4J_apoc_import_file_enabled + value: "true" envFrom: - configMapRef: name: maintenance-worker