Uses dynamically provisioned volume for Kafka too. It has matured, ...

simplifies use of multi-zone clusters, works in Minikube,
and volumes are deleted when the PV is deleted (by manual kubectl).

4 files changed, 2 insertions, 106 deletions

diff --git a/10pvc.yml b/10pvc.yml
deleted file mode 100644
index 51de19c..0000000
--- a/10pvc.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: datadir-kafka-0
-  namespace: kafka
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "0"
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: datadir-kafka-1
-  namespace: kafka
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "1"
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: datadir-kafka-2
-  namespace: kafka
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "2"
diff --git a/50kafka.yml b/50kafka.yml
index db7092d..372eba8 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -37,11 +37,11 @@ spec:
           --override log.dirs=/var/lib/kafka/data/topics
           --override broker.id=${HOSTNAME##*-}
         volumeMounts:
-        - name: datadir
+        - name: data
           mountPath: /var/lib/kafka/data
   volumeClaimTemplates:
   - metadata:
-      name: datadir
+      name: data
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
diff --git a/bootstrap/pv-template.yml b/bootstrap/pv-template.yml
deleted file mode 100644
index befb6b6..0000000
--- a/bootstrap/pv-template.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: datadir-kafka-0
-  labels:
-    app: kafka
-    podindex: "0"
-spec:
-  accessModes:
-  - ReadWriteOnce
-  capacity:
-    storage: 200Gi
-  hostPath:
-    path: /tmp/k8s-data/datadir-kafka-0
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: datadir-kafka-1
-  labels:
-    app: kafka
-    podindex: "1"
-spec:
-  accessModes:
-  - ReadWriteOnce
-  capacity:
-    storage: 200Gi
-  hostPath:
-    path: /tmp/k8s-data/datadir-kafka-1
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: datadir-kafka-2
-  labels:
-    app: kafka
-    podindex: "2"
-spec:
-  accessModes:
-  - ReadWriteOnce
-  capacity:
-    storage: 200Gi
-  hostPath:
-    path: /tmp/k8s-data/datadir-kafka-2
diff --git a/bootstrap/pv.sh b/bootstrap/pv.sh
deleted file mode 100755
index c12787b..0000000
--- a/bootstrap/pv.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "Note that in for example GKE a StatefulSet will have PersistentVolume(s) and PersistentVolumeClaim(s) created for it automatically"
-
-dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-path="$dir/data"
-echo "Please enter a path where to store data during local testing: ($path)"
-read newpath
-[ -n "$newpath" ] && path=$newpath
-
-cat bootstrap/pv-template.yml | sed "s|/tmp/k8s-data|$path|" | kubectl create -f -