From 562bfd6568e85a8d5d9f60532ddb7f0aa6dfb07c Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@google.com>
Date: Tue, 11 Jun 2019 13:57:34 -0400
Subject: [PATCH 1/3] Add per-deployment volume claims

---
 .../persistentvolumes/persistent-volumes.yml  | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml b/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
index c074f915..e3b3bcd0 100644
--- a/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
+++ b/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
@@ -1,9 +1,48 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: auto-etl-gardener-disk0
+  name: gardener-ndt-disk0
   annotations:
-    volume.beta.kubernetes.io/storage-class: "fast"
+    volume.beta.kubernetes.io/storage-class: "slow"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+--
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: gardener-switch-disk0
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "slow"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+--
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: gardener-sidestream-disk0
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "slow"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+--
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: gardener-tcpinfo-disk0
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "slow"
 spec:
   accessModes:
     - ReadWriteOnce

From 4cfd3b9b6688b63473fc8ab27216946271f366ae Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@google.com>
Date: Tue, 11 Jun 2019 13:57:54 -0400
Subject: [PATCH 2/3] Use persistent volume claims

---
 .../deployments/etl-gardener-disco.yml                 |  9 +++++++++
 .../deployments/etl-gardener-ndt.yml                   | 10 ++++++++++
 .../deployments/etl-gardener-sidestream.yml            | 10 ++++++++++
 3 files changed, 29 insertions(+)

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml b/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml
index cf4b4619..fef7f8d1 100644
--- a/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml
+++ b/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml
@@ -83,5 +83,14 @@ spec:
             memory: "3Gi"
             cpu: "1"
 
+        volumeMounts:
+        - mountPath: /volume-claim
+          name: switch-storage
+
       nodeSelector:
         gardener-node: "true"
+
+      volumes:
+      - name: switch-storage
+        persistentVolumeClaim:
+          claimName: gardener-switch-disk0
diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml b/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml
index e442afef..2744ecc1 100644
--- a/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml
+++ b/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml
@@ -84,5 +84,15 @@ spec:
             memory: "3Gi"
             cpu: "1"
 
+        volumeMounts:
+        - mountPath: /volume-claim
+          name: ndt-storage
+
       nodeSelector:
         gardener-node: "true"
+
+      volumes:
+      - name: ndt-storage
+        persistentVolumeClaim:
+          claimName: gardener-ndt-disk0
+
diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml b/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml
index ecfb9c1e..196097c2 100644
--- a/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml
+++ b/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml
@@ -84,5 +84,15 @@ spec:
             memory: "3Gi"
             cpu: "1"
 
+        volumeMounts:
+        - mountPath: /volume-claim
+          name: sidestream-storage
+
       nodeSelector:
         gardener-node: "true"
+
+      volumes:
+      - name: sidestream-storage
+        persistentVolumeClaim:
+          claimName: gardener-sidestream-disk0
+

From cd03e757335a7c1ca0440645eb2a9566cde52f9f Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@google.com>
Date: Tue, 11 Jun 2019 14:43:53 -0400
Subject: [PATCH 3/3] Fix record separation

---
 .../persistentvolumes/persistent-volumes.yml                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml b/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
index e3b3bcd0..b61409b1 100644
--- a/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
+++ b/k8s/data-processing-cluster/persistentvolumes/persistent-volumes.yml
@@ -10,7 +10,7 @@ spec:
   resources:
     requests:
       storage: 10Gi
---
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -23,7 +23,7 @@ spec:
   resources:
     requests:
       storage: 10Gi
---
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -36,7 +36,7 @@ spec:
   resources:
     requests:
       storage: 10Gi
---
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata: