diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index f83db660c..4a30bbc4a 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -1288,7 +1288,7 @@ spec: x-kubernetes-preserve-unknown-fields: true subresources: status: {} ---- +--- {{- else }} --- apiVersion: apiextensions.k8s.io/v1beta1 @@ -1432,7 +1432,6 @@ spec: storageClassDeviceSets: {} driveGroups: type: array - nullable: true items: properties: name: 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 ad9bd1e55..10614fa05 100644 --- a/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml +++ b/cluster/examples/kubernetes/ceph/pre-k8s-1.16/crd.yaml @@ -158,7 +158,6 @@ spec: storageClassDeviceSets: {} driveGroups: type: array - nullable: true items: properties: name: diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 0f61b5887..ef60523fe 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -1508,7 +1508,6 @@ spec: storageClassDeviceSets: {} driveGroups: type: array - nullable: true items: properties: name: