From 363baeb19b51b146c35c5fc9c046aebe30bb77f5 Mon Sep 17 00:00:00 2001
From: Tim Hughes <thughes@thegoldfish.org>
Date: Thu, 24 Sep 2020 18:30:19 +0100
Subject: [PATCH 1/2] docs: changes example yamls to use
 parameters.compression_mode

Makes compression_mode in example yamls consistent

Closes: https://github.com/rook/rook/issues/6318
Signed-off-by: Tim Hughes <thughes@thegoldfish.org>
---
 cluster/examples/kubernetes/ceph/filesystem-ec.yaml    | 3 ++-
 cluster/examples/kubernetes/ceph/filesystem-test.yaml  | 3 ++-
 cluster/examples/kubernetes/ceph/object-multisite.yaml | 3 ++-
 cluster/examples/kubernetes/ceph/object-test.yaml      | 3 ++-
 cluster/examples/kubernetes/ceph/pool-test.yaml        | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cluster/examples/kubernetes/ceph/filesystem-ec.yaml b/cluster/examples/kubernetes/ceph/filesystem-ec.yaml
index 3ba1aff2a..32a5c3d76 100644
--- a/cluster/examples/kubernetes/ceph/filesystem-ec.yaml
+++ b/cluster/examples/kubernetes/ceph/filesystem-ec.yaml
@@ -22,7 +22,8 @@ spec:
         dataChunks: 2
         codingChunks: 1
       # Inline compression mode for the data pool
-      compressionMode: none
+      parameters:
+        compression_mode: none
   # Whether to preserve metadata and data pools on filesystem deletion
   preservePoolsOnDelete: true
   # The metadata service (mds) configuration
diff --git a/cluster/examples/kubernetes/ceph/filesystem-test.yaml b/cluster/examples/kubernetes/ceph/filesystem-test.yaml
index 02ef865ad..f33296275 100644
--- a/cluster/examples/kubernetes/ceph/filesystem-test.yaml
+++ b/cluster/examples/kubernetes/ceph/filesystem-test.yaml
@@ -18,7 +18,8 @@ spec:
       replicated:
         size: 1
         requireSafeReplicaSize: false
-      compressionMode: none
+      parameters:
+        compression_mode: none
   preservePoolsOnDelete: false
   metadataServer:
     activeCount: 1
diff --git a/cluster/examples/kubernetes/ceph/object-multisite.yaml b/cluster/examples/kubernetes/ceph/object-multisite.yaml
index 18b2321bf..a2e25f023 100644
--- a/cluster/examples/kubernetes/ceph/object-multisite.yaml
+++ b/cluster/examples/kubernetes/ceph/object-multisite.yaml
@@ -33,7 +33,8 @@ spec:
     replicated:
       size: 1
       requireSafeReplicaSize: true
-    compressionMode: none
+    parameters:
+      compression_mode: none
 ---
 apiVersion: ceph.rook.io/v1
 kind: CephObjectStore
diff --git a/cluster/examples/kubernetes/ceph/object-test.yaml b/cluster/examples/kubernetes/ceph/object-test.yaml
index d594f872a..15fb7cd2e 100644
--- a/cluster/examples/kubernetes/ceph/object-test.yaml
+++ b/cluster/examples/kubernetes/ceph/object-test.yaml
@@ -15,7 +15,8 @@ spec:
   dataPool:
     replicated:
       size: 1
-    compressionMode: none
+    parameters:
+      compression_mode: none
   preservePoolsOnDelete: false
   gateway:
     type: s3
diff --git a/cluster/examples/kubernetes/ceph/pool-test.yaml b/cluster/examples/kubernetes/ceph/pool-test.yaml
index fc1da8b03..2cbefc878 100644
--- a/cluster/examples/kubernetes/ceph/pool-test.yaml
+++ b/cluster/examples/kubernetes/ceph/pool-test.yaml
@@ -11,4 +11,5 @@ metadata:
 spec:
   replicated:
     size: 1
-  compressionMode: none
+  parameters:
+    compression_mode: none

From 406d3f44f82ad4a1498fe388d1a93ac30c4abfae Mon Sep 17 00:00:00 2001
From: Tim Hughes <thughes@thegoldfish.org>
Date: Thu, 24 Sep 2020 22:43:07 +0100
Subject: [PATCH 2/2] docs: remove compression from test yamls

Signed-off-by: Tim Hughes <thughes@thegoldfish.org>
---
 cluster/examples/kubernetes/ceph/filesystem-test.yaml | 2 --
 cluster/examples/kubernetes/ceph/object-test.yaml     | 2 --
 cluster/examples/kubernetes/ceph/pool-test.yaml       | 2 --
 3 files changed, 6 deletions(-)

diff --git a/cluster/examples/kubernetes/ceph/filesystem-test.yaml b/cluster/examples/kubernetes/ceph/filesystem-test.yaml
index f33296275..a23ee3642 100644
--- a/cluster/examples/kubernetes/ceph/filesystem-test.yaml
+++ b/cluster/examples/kubernetes/ceph/filesystem-test.yaml
@@ -18,8 +18,6 @@ spec:
       replicated:
         size: 1
         requireSafeReplicaSize: false
-      parameters:
-        compression_mode: none
   preservePoolsOnDelete: false
   metadataServer:
     activeCount: 1
diff --git a/cluster/examples/kubernetes/ceph/object-test.yaml b/cluster/examples/kubernetes/ceph/object-test.yaml
index 15fb7cd2e..526379c21 100644
--- a/cluster/examples/kubernetes/ceph/object-test.yaml
+++ b/cluster/examples/kubernetes/ceph/object-test.yaml
@@ -15,8 +15,6 @@ spec:
   dataPool:
     replicated:
       size: 1
-    parameters:
-      compression_mode: none
   preservePoolsOnDelete: false
   gateway:
     type: s3
diff --git a/cluster/examples/kubernetes/ceph/pool-test.yaml b/cluster/examples/kubernetes/ceph/pool-test.yaml
index 2cbefc878..a005a7024 100644
--- a/cluster/examples/kubernetes/ceph/pool-test.yaml
+++ b/cluster/examples/kubernetes/ceph/pool-test.yaml
@@ -11,5 +11,3 @@ metadata:
 spec:
   replicated:
     size: 1
-  parameters:
-    compression_mode: none