From 0575d572d5d63f596d7e57a6ac424cdbebd7bb90 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Wed, 25 Oct 2017 08:56:53 +0200
Subject: Uses the new storage class field, requires 1.8

---
 50kafka.yml                                  | 3 +--
 README.md                                    | 8 --------
 configure/gke-storageclass-broker-pd.yml     | 1 +
 configure/gke-storageclass-zookeeper-ssd.yml | 1 +
 zookeeper/50pzoo.yml                         | 3 +--
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/50kafka.yml b/50kafka.yml
index 5fcd943..0f0956e 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -77,10 +77,9 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: data
-      annotations:
-        volume.beta.kubernetes.io/storage-class: kafka-broker
     spec:
       accessModes: [ "ReadWriteOnce" ]
+      storageClassName: kafka-broker
       resources:
         requests:
           storage: 200Gi
diff --git a/README.md b/README.md
index fd37ccd..236b139 100644
--- a/README.md
+++ b/README.md
@@ -70,14 +70,6 @@ For clusters that enfoce [RBAC](https://kubernetes.io/docs/admin/authorization/r
 kubectl apply -f rbac-namespace-default/
 ```
 
-## Caution: `Delete` Reclaim Policy is default
-
-In production you likely want to [manually set Reclaim Policy](https://kubernetes.io/docs/tasks/administer-cluster/change-pv-reclaim-policy/),
-or your data will be gone if the generated [volume claim](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)s are deleted.
-
-This can't be done [in manifests](https://github.com/Yolean/kubernetes-kafka/pull/50),
-at least not [until Kubernetes 1.8](https://github.com/kubernetes/features/issues/352).
-
 ## Tests
 
 Tests are based on the [kube-test](https://github.com/Yolean/kube-test) concept.
diff --git a/configure/gke-storageclass-broker-pd.yml b/configure/gke-storageclass-broker-pd.yml
index d436148..dbb7203 100644
--- a/configure/gke-storageclass-broker-pd.yml
+++ b/configure/gke-storageclass-broker-pd.yml
@@ -3,5 +3,6 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: kafka-broker
 provisioner: kubernetes.io/gce-pd
+reclaimPolicy: Retain
 parameters:
   type: pd-standard
diff --git a/configure/gke-storageclass-zookeeper-ssd.yml b/configure/gke-storageclass-zookeeper-ssd.yml
index 44891ba..5d6673a 100644
--- a/configure/gke-storageclass-zookeeper-ssd.yml
+++ b/configure/gke-storageclass-zookeeper-ssd.yml
@@ -3,5 +3,6 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: kafka-zookeeper
 provisioner: kubernetes.io/gce-pd
+reclaimPolicy: Retain
 parameters:
   type: pd-ssd
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index fea60e0..a166a91 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -61,10 +61,9 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: data
-      annotations:
-        volume.beta.kubernetes.io/storage-class: kafka-zookeeper
     spec:
       accessModes: [ "ReadWriteOnce" ]
+      storageClassName: kafka-zookeeper
       resources:
         requests:
           storage: 1Gi
-- 
cgit v1.2.3