From 4f9b8a25619c9e4e3de291dc79e8492bcce334e1 Mon Sep 17 00:00:00 2001
From: subhamkrai <srai@redhat.com>
Date: Tue, 3 Nov 2020 10:38:56 +0530
Subject: [PATCH] ceph: helm test for k8s 1.15 failing

helm test for k8s 1.15 failing showing errors
CRDs not found, after some latest changes to CRDS.

Signed-off-by: subhamkrai <srai@redhat.com>
---
 .../charts/rook-ceph/templates/resources.yaml | 25 +++++++++++--------
 .../kubernetes/ceph/pre-k8s-1.16/crd.yaml     |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml
index 743cf0225..7a6478e47 100644
--- a/cluster/charts/rook-ceph/templates/resources.yaml
+++ b/cluster/charts/rook-ceph/templates/resources.yaml
@@ -282,6 +282,18 @@ spec:
                         iteration:
                           type: integer
                           format: int32
+                security:
+                  type: object
+                  properties:
+                    kms:
+                      type: object
+                      properties:
+                        connectionDetails:
+                          type: object
+                          nullable: true
+                          x-kubernetes-preserve-unknown-fields: true
+                        tokenSecretName:
+                          type: string
                 annotations:
                   type: object
                   nullable: true
@@ -1272,7 +1284,9 @@ spec:
               x-kubernetes-preserve-unknown-fields: true
       subresources:
         status: {}
+---    
 {{- else }}
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1438,6 +1452,7 @@ spec:
                   type: boolean
             placement: {}
             resources: {}
+            security: {}
             cleanupPolicy:
               properties:
                 confirmation:
@@ -1454,16 +1469,6 @@ spec:
                     iteration:
                       type: integer
                       format: int32
-            security:
-              properties:
-                kms:
-                  properties:
-                    connectionDetails:
-                      type: object
-                      nullable: true
-                      x-kubernetes-preserve-unknown-fields: true
-                    tokenSecretName:
-                      type: string
   additionalPrinterColumns:
     - name: DataDirHostPath
       type: string
diff --git a/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml b/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml
index 00716c45d..ad9bd1e55 100644
--- a/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml
+++ b/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml
@@ -202,6 +202,7 @@ spec:
                     iteration:
                       type: integer
                       format: int32
+            security: {}
             placement: {}
             resources: {}
             healthCheck: {}