From 36c53fe6f321c5ecafc5e9f9aec60c25d175f2f7 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Tue, 17 Aug 2021 12:19:26 -0600 Subject: [PATCH] ceph: make storage device config nullable Signed-off-by: Blaine Gardner --- cluster/charts/rook-ceph/templates/resources.yaml | 2 ++ cluster/examples/kubernetes/ceph/crds.yaml | 2 ++ pkg/apis/ceph.rook.io/v1/types.go | 1 + 3 files changed, 5 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index d887d7a6e..8eed72358 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -1887,6 +1887,7 @@ spec: config: additionalProperties: type: string + nullable: true type: object x-kubernetes-preserve-unknown-fields: true fullpath: @@ -1921,6 +1922,7 @@ spec: config: additionalProperties: type: string + nullable: true type: object x-kubernetes-preserve-unknown-fields: true fullpath: diff --git a/cluster/examples/kubernetes/ceph/crds.yaml b/cluster/examples/kubernetes/ceph/crds.yaml index 71e725d6e..303d8a1c6 100644 --- a/cluster/examples/kubernetes/ceph/crds.yaml +++ b/cluster/examples/kubernetes/ceph/crds.yaml @@ -1887,6 +1887,7 @@ spec: config: additionalProperties: type: string + nullable: true type: object x-kubernetes-preserve-unknown-fields: true fullpath: @@ -1921,6 +1922,7 @@ spec: config: additionalProperties: type: string + nullable: true type: object x-kubernetes-preserve-unknown-fields: true fullpath: diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index a7ee4305b..5685a4c74 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -1936,6 +1936,7 @@ type Device struct { // +optional FullPath string `json:"fullpath,omitempty"` // +kubebuilder:pruning:PreserveUnknownFields + // +nullable // +optional Config map[string]string `json:"config,omitempty"` }