From 58f96b6aeec4c5f7f5b54074efecbfd34554c4e5 Mon Sep 17 00:00:00 2001 From: parth-gr Date: Tue, 26 Mar 2024 14:16:04 +0530 Subject: [PATCH] external: remove replicated 3 pool for the rbd sc csi pr get merged ceph/ceph-csi#4459 so, This reverts commit 812a9c02b060bc4a8a5aa5f0128e7ae22512da87. The csi PR removes the dependency of the pool parameter from the rbd storage class if the topology pools are passed, so removing them in the examples and making it optional Signed-off-by: parth-gr --- .../CRDs/Cluster/external-cluster/topology-for-external-mode.md | 1 - deploy/examples/create-external-cluster-resources.py | 1 - deploy/examples/import-external-cluster.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/Documentation/CRDs/Cluster/external-cluster/topology-for-external-mode.md b/Documentation/CRDs/Cluster/external-cluster/topology-for-external-mode.md index 67fda8817..c76702713 100644 --- a/Documentation/CRDs/Cluster/external-cluster/topology-for-external-mode.md +++ b/Documentation/CRDs/Cluster/external-cluster/topology-for-external-mode.md @@ -95,7 +95,6 @@ metadata: parameters: ... ... - pool: replicapool topologyConstrainedPools: | [ {"poolName":"pool-a", diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py index b4404f745..72f4692db 100644 --- a/deploy/examples/create-external-cluster-resources.py +++ b/deploy/examples/create-external-cluster-resources.py @@ -1932,7 +1932,6 @@ class RadosJSON: "TOPOLOGY_FAILURE_DOMAIN_VALUES" ], "topologyPools": self.out_map["TOPOLOGY_POOLS"], - "pool": self.out_map["RBD_POOL_NAME"], "csi.storage.k8s.io/provisioner-secret-name": f"rook-{self.out_map['CSI_RBD_PROVISIONER_SECRET_NAME']}", "csi.storage.k8s.io/controller-expand-secret-name": f"rook-{self.out_map['CSI_RBD_PROVISIONER_SECRET_NAME']}", "csi.storage.k8s.io/node-stage-secret-name": f"rook-{self.out_map['CSI_RBD_NODE_SECRET_NAME']}", diff --git a/deploy/examples/import-external-cluster.sh b/deploy/examples/import-external-cluster.sh index 2da209316..ed17a7abc 100644 --- a/deploy/examples/import-external-cluster.sh +++ b/deploy/examples/import-external-cluster.sh @@ -334,7 +334,6 @@ metadata: provisioner: $RBD_PROVISIONER parameters: clusterID: $CLUSTER_ID_RBD - pool: $RBD_POOL_NAME imageFormat: "2" imageFeatures: $ROOK_RBD_FEATURES topologyConstrainedPools: |