From b4b1182d2e4609d65cb8130c1a25e321fffa6f4e Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 1 Oct 2019 09:34:11 +0200 Subject: [PATCH] Ceph CRD Validation: Add reservePoolsOnDelete Signed-off-by: Sebastian Wagner --- cluster/charts/rook-ceph/templates/resources.yaml | 4 ++++ cluster/examples/kubernetes/ceph/common.yaml | 4 ++++ tests/framework/installer/ceph_manifests.go | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 5664a55f5..95a2ad599 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -246,6 +246,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean additionalPrinterColumns: - name: ActiveMDS type: string @@ -348,6 +350,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 8fb04474b..7df5185ef 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -267,6 +267,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean additionalPrinterColumns: - name: ActiveMDS type: string @@ -373,6 +375,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean # OLM: END CEPH OBJECT STORE CRD # OLM: BEGIN CEPH OBJECT STORE USERS CRD --- diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 663eae2e7..e5961a3eb 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -319,6 +319,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean additionalPrinterColumns: - name: ActiveMDS type: string @@ -421,6 +423,8 @@ spec: type: integer codingChunks: type: integer + preservePoolsOnDelete: + type: boolean --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition