From 96978c5228bb33bd889b9b84ff49396060259546 Mon Sep 17 00:00:00 2001
From: CraigSterrett <craig.sterrett@intel.com>
Date: Fri, 27 Mar 2020 11:22:17 -0700
Subject: [PATCH] Rook updated to v1.2.6 (#315)

Rook updated to V1.2.6

Closes issue #312
https://github.com/clearlinux/cloud-native-setup/issues/312

Signed-off-by: Craig Sterrett <craig.Sterrett@intel.com>
---
 .../v1.2.6/multinode/kustomization.yaml       | 10 +++++++++
 .../v1.2.6/multinode/patch_cephcluster.yaml   | 10 +++++++++
 .../v1.2.6/standalone/kustomization.yaml      | 10 +++++++++
 .../v1.2.6/standalone/patch_cephcluster.yaml  | 22 +++++++++++++++++++
 clr-k8s-examples/create_stack.sh              |  2 +-
 5 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/kustomization.yaml
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/patch_cephcluster.yaml
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/kustomization.yaml
 create mode 100644 clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/patch_cephcluster.yaml

diff --git a/clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/kustomization.yaml b/clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/kustomization.yaml
new file mode 100644
index 0000000..6b0fe1c
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/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.2.6/multinode/patch_cephcluster.yaml b/clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/patch_cephcluster.yaml
new file mode 100644
index 0000000..29df390
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.2.6/multinode/patch_cephcluster.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: ceph.rook.io/v1
+kind: CephCluster
+metadata:
+  name: rook-ceph
+  namespace: rook-ceph
+spec:
+  storage:
+    directories:
+      - path: /var/lib/rook
diff --git a/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/kustomization.yaml b/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/kustomization.yaml
new file mode 100644
index 0000000..07b29ff
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/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
diff --git a/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/patch_cephcluster.yaml b/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/patch_cephcluster.yaml
new file mode 100644
index 0000000..be72622
--- /dev/null
+++ b/clr-k8s-examples/7-rook/overlays/v1.2.6/standalone/patch_cephcluster.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: ceph.rook.io/v1
+kind: CephCluster
+metadata:
+  name: rook-ceph
+  namespace: rook-ceph
+spec:
+  mon:
+    allowMultiplePerNode: true
+  storage:
+    directories:
+      - path: /var/lib/rook
+---
+apiVersion: ceph.rook.io/v1
+kind: CephBlockPool
+metadata:
+  name: replicapool
+  namespace: rook-ceph
+spec:
+  replicated:
+    requireSafeReplicaSize: false
+    size: 1
diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh
index 9c2f470..f502fe2 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.4}"
 FLANNEL_VER="${CLRK8S_FLANNEL_VER:-960b3243b9a7faccdfe7b3c09097105e68030ea7}"
 K8S_VER="${CLRK8S_K8S_VER:-}"
 KATA_VER="${CLRK8S_KATA_VER:-1.9.1-kernel-config}"
-ROOK_VER="${CLRK8S_ROOK_VER:-v1.1.7}"
+ROOK_VER="${CLRK8S_ROOK_VER:-v1.2.6}"
 METRICS_VER="${CLRK8S_METRICS_VER:-v0.3.6}"
 DASHBOARD_VER="${CLRK8S_DASHBOARD_VER:-v2.0.0-beta2}"
 INGRES_VER="${CLRK8S_INGRES_VER:-nginx-0.26.1}"