From 5d42de4d7b0ffb42ce02d9a9a81b0e02e9eee8d3 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Mon, 11 Jan 2016 14:39:36 -0800 Subject: [PATCH 1/9] fix(deis-minio-rc.yaml): begin moving minio data to persistent volume --- manifests/deis-minio-rc.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml index a4a6b13..3611d07 100644 --- a/manifests/deis-minio-rc.yaml +++ b/manifests/deis-minio-rc.yaml @@ -27,7 +27,7 @@ spec: # - "--cert=/var/run/secrets/deis/minio/ssl/access-cert" # - "--key=/var/run/secrets/deis/minio/ssl/access-pem" - "server" - - "/home/minio/" + - "/mnt/minio/data" volumeMounts: - name: minio-admin mountPath: /var/run/secrets/deis/minio/admin @@ -45,6 +45,8 @@ spec: - name: minio-user secret: secretName: minio-user + - name: minio-data + # - name: minio-ssl # secret: # secretName: minio-ssl From 632fe4027ebc2dd61b83d6d571d12dae35b95bab Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 09:20:50 -0800 Subject: [PATCH 2/9] feat(deis-minio-pvc.yaml): add persistent volume claim for minio --- manifests/deis-minio-pvc.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 manifests/deis-minio-pvc.yaml diff --git a/manifests/deis-minio-pvc.yaml b/manifests/deis-minio-pvc.yaml new file mode 100644 index 0000000..35edbc0 --- /dev/null +++ b/manifests/deis-minio-pvc.yaml @@ -0,0 +1,11 @@ +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: minio-data +spec: + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Reclaim + resources: + requests: + storage: 8Gi From 6b0a4506f64dab533775a7a96663ebfb8b3f1e3d Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 09:21:02 -0800 Subject: [PATCH 3/9] fix(deis-minio-rc.yaml): use the minio persistent volume claim --- manifests/deis-minio-rc.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml index 3611d07..b5a09e0 100644 --- a/manifests/deis-minio-rc.yaml +++ b/manifests/deis-minio-rc.yaml @@ -35,6 +35,8 @@ spec: - name: minio-user mountPath: /var/run/secrets/deis/minio/user readOnly: true + - name: minio-data + mountPath: /mnt/minio/data # - name: minio-ssl # mountPath: /var/run/secrets/deis/minio/ssl # readOnly: true @@ -46,7 +48,9 @@ spec: secret: secretName: minio-user - name: minio-data - + PersistentVolumeClaim: + claimName: minio-data + # - name: minio-ssl # secret: # secretName: minio-ssl From 56a0c4534b701bf217b86dec3732a1f83ebf1cae Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 09:24:14 -0800 Subject: [PATCH 4/9] fix(deis-minio-pvc.yaml): add local label to the claim --- manifests/deis-minio-pvc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/deis-minio-pvc.yaml b/manifests/deis-minio-pvc.yaml index 35edbc0..145a4d3 100644 --- a/manifests/deis-minio-pvc.yaml +++ b/manifests/deis-minio-pvc.yaml @@ -2,6 +2,8 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: minio-data + labels: + type: local spec: accessModes: - ReadWriteOnce From 934eb12e4a07b644f76cce9b06f63d3ad34ee03d Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 10:21:48 -0800 Subject: [PATCH 5/9] fix(deis-minio-pvc.yaml): remove invalid line from the claim --- manifests/deis-minio-pvc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/deis-minio-pvc.yaml b/manifests/deis-minio-pvc.yaml index 145a4d3..b571850 100644 --- a/manifests/deis-minio-pvc.yaml +++ b/manifests/deis-minio-pvc.yaml @@ -7,7 +7,6 @@ metadata: spec: accessModes: - ReadWriteOnce - persistentVolumeReclaimPolicy: Reclaim resources: requests: storage: 8Gi From d154c47f02976064e00be3de550943edf48b71dc Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 10:22:08 -0800 Subject: [PATCH 6/9] feat(deis-minio-pv.yaml): add the persistent volume for minio --- manifests/deis-minio-pv.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 manifests/deis-minio-pv.yaml diff --git a/manifests/deis-minio-pv.yaml b/manifests/deis-minio-pv.yaml new file mode 100644 index 0000000..7332672 --- /dev/null +++ b/manifests/deis-minio-pv.yaml @@ -0,0 +1,13 @@ +kind: PersistentVolume +apiVersion: v1 +metadata: + name: minio-data + labels: + type: local +spec: + capacity: + storage: 8Gi + accessModes: + - ReadWriteOnce + hostPath: + path: /mnt/minio/data From 32293393a5f0630673832b6d71905ae1b5e72074 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 10:24:00 -0800 Subject: [PATCH 7/9] fix(deis-minio-rc.yaml): fix syntax error in RC manifest --- manifests/deis-minio-rc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml index b5a09e0..28bfd7b 100644 --- a/manifests/deis-minio-rc.yaml +++ b/manifests/deis-minio-rc.yaml @@ -48,7 +48,7 @@ spec: secret: secretName: minio-user - name: minio-data - PersistentVolumeClaim: + persistentVolumeClaim: claimName: minio-data # - name: minio-ssl From 014cb4b2e2c22229319630ab7e32f51ebf5080f3 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 10:38:27 -0800 Subject: [PATCH 8/9] fix(deis-minio): include deis in the claim and volume name --- manifests/deis-minio-pv.yaml | 2 +- manifests/deis-minio-pvc.yaml | 2 +- manifests/deis-minio-rc.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/deis-minio-pv.yaml b/manifests/deis-minio-pv.yaml index 7332672..a96e1e1 100644 --- a/manifests/deis-minio-pv.yaml +++ b/manifests/deis-minio-pv.yaml @@ -1,7 +1,7 @@ kind: PersistentVolume apiVersion: v1 metadata: - name: minio-data + name: deis-minio-data labels: type: local spec: diff --git a/manifests/deis-minio-pvc.yaml b/manifests/deis-minio-pvc.yaml index b571850..510924b 100644 --- a/manifests/deis-minio-pvc.yaml +++ b/manifests/deis-minio-pvc.yaml @@ -1,7 +1,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: minio-data + name: deis-minio-data labels: type: local spec: diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml index 28bfd7b..579ffd3 100644 --- a/manifests/deis-minio-rc.yaml +++ b/manifests/deis-minio-rc.yaml @@ -49,7 +49,7 @@ spec: secretName: minio-user - name: minio-data persistentVolumeClaim: - claimName: minio-data + claimName: deis-minio-data # - name: minio-ssl # secret: From a6dabea8e0f3b03dcc22dffade10cade935735a1 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Thu, 14 Jan 2016 15:17:57 -0800 Subject: [PATCH 9/9] fix(Dockerfile,deis-minio-rc.yaml): create and assign server data directory at /mnt/minio/data --- manifests/deis-minio-rc.yaml | 4 ++-- rootfs/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml index 579ffd3..290e113 100644 --- a/manifests/deis-minio-rc.yaml +++ b/manifests/deis-minio-rc.yaml @@ -26,8 +26,8 @@ spec: # not running with ssl yet # - "--cert=/var/run/secrets/deis/minio/ssl/access-cert" # - "--key=/var/run/secrets/deis/minio/ssl/access-pem" - - "server" - - "/mnt/minio/data" + - server + - /mnt/minio/data volumeMounts: - name: minio-admin mountPath: /var/run/secrets/deis/minio/admin diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 6a12fdb..6ce4167 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update -y && apt-get install -y -q curl RUN curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc RUN chmod 755 /usr/bin/mc COPY . / +RUN mkdir -p /mnt/minio/data && chmod 777 /mnt/minio/data USER minio RUN mkdir /home/minio/.minio ENTRYPOINT ["boot"]