diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index f050a6a36..dbb9d0397 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -321,6 +321,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -390,6 +392,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -4201,7 +4205,8 @@ spec: type: object served: true storage: true - subresources: {} + subresources: + status: {} status: acceptedNames: kind: "" @@ -4709,6 +4714,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -5541,7 +5548,8 @@ spec: type: object served: true storage: true - subresources: {} + subresources: + status: {} status: acceptedNames: kind: "" @@ -6084,6 +6092,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -6148,6 +6158,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7147,6 +7159,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7215,6 +7229,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7274,6 +7290,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7611,6 +7629,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -8139,6 +8159,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/cluster/examples/kubernetes/ceph/crds.yaml b/cluster/examples/kubernetes/ceph/crds.yaml index 9fba39aa3..0849be8ca 100644 --- a/cluster/examples/kubernetes/ceph/crds.yaml +++ b/cluster/examples/kubernetes/ceph/crds.yaml @@ -324,6 +324,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -393,6 +395,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -4204,7 +4208,8 @@ spec: type: object served: true storage: true - subresources: {} + subresources: + status: {} status: acceptedNames: kind: "" @@ -4712,6 +4717,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -5544,7 +5551,8 @@ spec: type: object served: true storage: true - subresources: {} + subresources: + status: {} status: acceptedNames: kind: "" @@ -6087,6 +6095,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -6151,6 +6161,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7150,6 +7162,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7218,6 +7232,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7277,6 +7293,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -7614,6 +7632,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" @@ -8142,6 +8162,8 @@ spec: type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index fe221b64e..fad83f2c3 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -42,6 +42,7 @@ import ( // +kubebuilder:printcolumn:name="Message",type=string,JSONPath=`.status.message`,description="Message" // +kubebuilder:printcolumn:name="Health",type=string,JSONPath=`.status.ceph.health`,description="Ceph Health" // +kubebuilder:printcolumn:name="External",type=boolean,JSONPath=`.spec.external.enable` +// +kubebuilder:subresource:status type CephCluster struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -539,6 +540,7 @@ type CrashCollectorSpec struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CephBlockPool represents a Ceph Storage Pool +// +kubebuilder:subresource:status type CephBlockPool struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -885,6 +887,7 @@ type ErasureCodedSpec struct { // CephFilesystem represents a Ceph Filesystem // +kubebuilder:printcolumn:name="ActiveMDS",type=string,JSONPath=`.spec.metadataServer.activeCount`,description="Number of desired active MDS daemons" // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp` +// +kubebuilder:subresource:status type CephFilesystem struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -980,6 +983,7 @@ type FSMirroringSpec struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CephObjectStore represents a Ceph Object Store Gateway +// +kubebuilder:subresource:status type CephObjectStore struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1131,11 +1135,12 @@ type BucketStatus struct { LastChanged string `json:"lastChanged,omitempty"` } +// CephObjectStoreUser represents a Ceph Object Store Gateway User // +genclient // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:resource:shortName=rcou;objectuser -// CephObjectStoreUser represents a Ceph Object Store Gateway User +// +kubebuilder:subresource:status type CephObjectStoreUser struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1177,6 +1182,7 @@ type ObjectStoreUserSpec struct { // +genclient // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +kubebuilder:subresource:status type CephObjectRealm struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1210,6 +1216,7 @@ type PullSpec struct { // +genclient // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +kubebuilder:subresource:status type CephObjectZoneGroup struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1237,6 +1244,7 @@ type ObjectZoneGroupSpec struct { // +genclient // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +kubebuilder:subresource:status type CephObjectZone struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1271,6 +1279,7 @@ type ObjectZoneSpec struct { // +genclient:noStatus // +kubebuilder:resource:shortName=nfs,path=cephnfses // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// +kubebuilder:subresource:status type CephNFS struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1397,6 +1406,7 @@ type DisruptionManagementSpec struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CephClient represents a Ceph Client +// +kubebuilder:subresource:status type CephClient struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1479,6 +1489,7 @@ type SanitizeDisksSpec struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CephRBDMirror represents a Ceph RBD Mirror +// +kubebuilder:subresource:status type CephRBDMirror struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -1548,6 +1559,7 @@ type RBDMirroringPeerSpec struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CephFilesystemMirror is the Ceph Filesystem Mirror object definition +// +kubebuilder:subresource:status type CephFilesystemMirror struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"`