From 6f3230bc6326ca0c508129434971efe76c95559c Mon Sep 17 00:00:00 2001
From: Maria Patterson <mtpatter@uw.edu>
Date: Thu, 5 Jul 2018 16:35:24 -0500
Subject: [PATCH] Fix for persistent volumes.

---
 .../alert-data-persistentvolumeclaim.yaml     | 47 ++++++++++---------
 kubernetes/sender-volume-deployment.yaml      | 31 +++++-------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/kubernetes/alert-data-persistentvolumeclaim.yaml b/kubernetes/alert-data-persistentvolumeclaim.yaml
index ea3f9db..4a52417 100644
--- a/kubernetes/alert-data-persistentvolumeclaim.yaml
+++ b/kubernetes/alert-data-persistentvolumeclaim.yaml
@@ -1,31 +1,36 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: alert-data
-  labels:
-    type: local
-spec:
-  storageClassName: manual
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: "/home/mtpatter/alert_data"
-
+## Run by NCSA
+#kind: PersistentVolume
+#apiVersion: v1
+#metadata:
+#  name: alerts-volume
+#  labels:
+#    lsst: alerts
+#spec:
+#  storageClassName: manual
+#  capacity:
+#    storage: 2000Gi
+#  accessModes:
+#    - ReadWriteMany
+#  nfs:
+#    path: /lsst/kubernetes/shared/alert_data
+#    server: 141.142.182.6
 
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: alert-data
-  name: alert-data
+  name: alert-claim
 spec:
   accessModes:
-  - ReadWriteOnce
+  - ReadWriteMany
+  volumeMode: Filesystem
   resources:
     requests:
-      storage: 10Gi
+      storage: 1950Gi
+  storageClassName: manual
+  selector:
+    matchLabels:
+      #lsst: "alerts"
+      type: scratch 
 status: {}
+
diff --git a/kubernetes/sender-volume-deployment.yaml b/kubernetes/sender-volume-deployment.yaml
index 5e85ae2..b0221b9 100644
--- a/kubernetes/sender-volume-deployment.yaml
+++ b/kubernetes/sender-volume-deployment.yaml
@@ -1,25 +1,21 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1 #extensions/v1beta1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.14.0 (fa706f2)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: sender
   name: sender
 spec:
+  selector:
+    matchLabels:
+      app: sender
   replicas: 1
-  strategy:
-    type: Recreate
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: sender
+        app: sender
     spec:
       containers:
-      - args:
+      - name: sender
+        image: lsst-kub001:5000/alert_stream
+        args:
         - python
         - bin/sendAlertStream.py
         - kafka.alerts-lsst.svc.cluster.local:9092
@@ -27,15 +23,14 @@ spec:
         env:
         - name: PYTHONUNBUFFERED
           value: "0"
-        image: lsst-kub001:5000/alert_stream
-        name: sender
-        resources: {}
+        #resources: {}
         volumeMounts:
         - mountPath: /home/alert_stream/data
-          name: alert-data
+          name: alert-volume
+          subPath: mtpatter/avro_171213/ # data in /scratch/ for now
       restartPolicy: Always
       volumes:
-      - name: alert-data
+      - name: alert-volume
         persistentVolumeClaim:
-          claimName: alert-data
+          claimName: alert-claim
 status: {}