Update rook test resources

electrocucaracha · Jun 19, 2024 · 1484c64 · 1484c64
1 parent 66b90b3
commit 1484c64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git 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
@@ -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