From 6cd87d74beaa5415b2aff4b3a1ae7586d6d4404b Mon Sep 17 00:00:00 2001
From: Khanak Nangia <khanak.nangia@intel.com>
Date: Thu, 5 Dec 2019 12:36:42 -0800
Subject: [PATCH] Updating rook to v1.1.7 (#283)

---
 .../7-rook/overlays/v1.1.7/kustomization.yaml          | 10 ++++++++++
 .../7-rook/overlays/v1.1.7/patch_cephcluster.yaml      |  9 +++++++++
 clr-k8s-examples/create_stack.sh                       |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.1.7/kustomization.yaml
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.1.7/patch_cephcluster.yaml

diff --git a/clr-k8s-examples/7-rook/overlays/v1.1.7/kustomization.yaml b/clr-k8s-examples/7-rook/overlays/v1.1.7/kustomization.yaml
new file mode 100644
index 0000000..6b0fe1c
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.1.7/kustomization.yaml
@@ -0,0 +1,10 @@
+resources:
+  - rook/cluster/examples/kubernetes/ceph/common.yaml
+  - rook/cluster/examples/kubernetes/ceph/operator.yaml
+  - rook/cluster/examples/kubernetes/ceph/cluster.yaml
+  - rook/cluster/examples/kubernetes/ceph/csi/rbd/storageclass.yaml
+
+patchesStrategicMerge:
+  # patches rook to use 'directories' instead of partitions.
+  # comment out to use partitions
+  - patch_cephcluster.yaml
\ No newline at end of file
diff --git a/clr-k8s-examples/7-rook/overlays/v1.1.7/patch_cephcluster.yaml b/clr-k8s-examples/7-rook/overlays/v1.1.7/patch_cephcluster.yaml
new file mode 100644
index 0000000..194933a
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.1.7/patch_cephcluster.yaml
@@ -0,0 +1,9 @@
+apiVersion: ceph.rook.io/v1
+kind: CephCluster
+metadata:
+  name: rook-ceph
+  namespace: rook-ceph
+spec:
+  storage:
+    directories:
+     - path: /var/lib/rook
\ No newline at end of file
diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh
index 65257a6..0c8ca50 100755
--- a/clr-k8s-examples/create_stack.sh
+++ b/clr-k8s-examples/create_stack.sh
@@ -21,7 +21,7 @@ CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.6}"
 FLANNEL_VER="${CLRK8S_FLANNEL_VER:-16b0fe66285d1ad1f42b154ab852682f6fafb1a7}"
 K8S_VER="${CLRK8S_K8S_VER:-}"
 KATA_VER="${CLRK8S_KATA_VER:-1.9.1-kernel-config}"
-ROOK_VER="${CLRK8S_ROOK_VER:-v1.1.1}"
+ROOK_VER="${CLRK8S_ROOK_VER:-v1.1.7}"
 METRICS_VER="${CLRK8S_METRICS_VER:-v0.3.5}"
 DASHBOARD_VER="${CLRK8S_DASHBOARD_VER:-v2.0.0-beta2}"
 INGRES_VER="${CLRK8S_INGRES_VER:-nginx-0.25.1}"