From 1484c6456b984f08d4959192b0b323adff951ccf Mon Sep 17 00:00:00 2001
From: Victor Morales <chipahuac@hotmail.com>
Date: Tue, 18 Jun 2024 17:29:57 -0700
Subject: [PATCH] Update rook test resources

---
 tests/resources/rook/cluster-test.yaml | 24 ++++++++++--------------
 tests/resources/rook/toolbox.yaml      |  3 ++-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tests/resources/rook/cluster-test.yaml b/tests/resources/rook/cluster-test.yaml
index 5863d5e6..a4818c55 100644
--- a/tests/resources/rook/cluster-test.yaml
+++ b/tests/resources/rook/cluster-test.yaml
@@ -8,20 +8,6 @@
 #   kubectl create -f crds.yaml -f common.yaml -f operator.yaml
 #   kubectl create -f cluster-test.yaml
 #################################################################################################################
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: rook-config-override
-  namespace: rook-ceph  # namespace:cluster
-data:
-  config: |
-    [global]
-    osd_pool_default_size = 1
-    mon_warn_on_pool_no_redundancy = false
-    bdev_flock_retry = 20
-    bluefs_buffered_io = false
-    mon_data_avail_warn = 10
----
 apiVersion: ceph.rook.io/v1
 kind: CephCluster
 metadata:
@@ -38,6 +24,9 @@ spec:
   mgr:
     count: 1
     allowMultiplePerNode: true
+    modules:
+      - name: rook
+        enabled: true
   dashboard:
     enabled: true
   crashCollector:
@@ -58,6 +47,13 @@ spec:
     mgr: system-cluster-critical
   disruptionManagement:
     managePodBudgets: true
+  cephConfig:
+    global:
+      osd_pool_default_size: "1"
+      mon_warn_on_pool_no_redundancy: "false"
+      bdev_flock_retry: "20"
+      bluefs_buffered_io: "false"
+      mon_data_avail_warn: "10"
 ---
 apiVersion: ceph.rook.io/v1
 kind: CephBlockPool
diff --git a/tests/resources/rook/toolbox.yaml b/tests/resources/rook/toolbox.yaml
index 6ebd858c..8b69401e 100644
--- a/tests/resources/rook/toolbox.yaml
+++ b/tests/resources/rook/toolbox.yaml
@@ -17,9 +17,10 @@ spec:
         app: rook-ceph-tools
     spec:
       dnsPolicy: ClusterFirstWithHostNet
+      serviceAccountName: rook-ceph-default
       containers:
         - name: rook-ceph-tools
-          image: quay.io/ceph/ceph:v17.2.6
+          image: quay.io/ceph/ceph:v18.2.2
           command:
             - /bin/bash
             - -c