From 1a8662922a9a764cdfd5560dd0b9607848e5045b Mon Sep 17 00:00:00 2001 From: Anna Taraday Date: Tue, 5 Nov 2024 10:38:16 +0000 Subject: [PATCH] Do not use subresource status in CRDs --- api/v2/cassandrabackup_types.go | 1 - api/v2/cassandracluster_types.go | 1 - api/v2/cassandrarestore_types.go | 1 - charts/casskop/crds/db.orange.com_cassandrabackups.yaml | 2 -- charts/casskop/crds/db.orange.com_cassandraclusters.yaml | 2 -- charts/casskop/crds/db.orange.com_cassandrarestores.yaml | 2 -- charts/multi-casskop/crds/db.orange.com_cassandrabackups.yaml | 2 -- charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml | 2 -- charts/multi-casskop/crds/db.orange.com_cassandrarestores.yaml | 2 -- config/crd/bases/db.orange.com_cassandrabackups.yaml | 2 -- config/crd/bases/db.orange.com_cassandraclusters.yaml | 2 -- config/crd/bases/db.orange.com_cassandrarestores.yaml | 2 -- 12 files changed, 21 deletions(-) diff --git a/api/v2/cassandrabackup_types.go b/api/v2/cassandrabackup_types.go index fb06c08a..fcb47a17 100644 --- a/api/v2/cassandrabackup_types.go +++ b/api/v2/cassandrabackup_types.go @@ -72,7 +72,6 @@ func (b BackupConditionType) HasFailed() bool { // CassandraBackup is the Schema for the cassandrabackups API // +k8s:openapi-gen=true -// +kubebuilder:subresource:status type CassandraBackup struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/api/v2/cassandracluster_types.go b/api/v2/cassandracluster_types.go index c2656e30..ce8f02fe 100644 --- a/api/v2/cassandracluster_types.go +++ b/api/v2/cassandracluster_types.go @@ -1001,7 +1001,6 @@ type CassandraNodeStatus struct { // CassandraCluster is the Schema for the cassandraclusters API // +k8s:openapi-gen=true // +kubebuilder:storageversion -// +kubebuilder:subresource:status // +kubebuilder:resource:path=cassandraclusters,scope=Namespaced,shortName=cassc;casscs type CassandraCluster struct { metav1.TypeMeta `json:",inline"` diff --git a/api/v2/cassandrarestore_types.go b/api/v2/cassandrarestore_types.go index c04e735a..6e065313 100644 --- a/api/v2/cassandrarestore_types.go +++ b/api/v2/cassandrarestore_types.go @@ -84,7 +84,6 @@ type CassandraRestoreSpec struct { // +genclient:noStatus // +resourceName=cassandrarestores // +kubebuilder:object:root=true -// +kubebuilder:subresource:status // CassandraRestore is a Casskop Operator resource that represents the restoration of a backup of a Cassandra cluster type CassandraRestore struct { metav1.TypeMeta `json:",inline"` diff --git a/charts/casskop/crds/db.orange.com_cassandrabackups.yaml b/charts/casskop/crds/db.orange.com_cassandrabackups.yaml index f7bfb683..9309e0ae 100644 --- a/charts/casskop/crds/db.orange.com_cassandrabackups.yaml +++ b/charts/casskop/crds/db.orange.com_cassandrabackups.yaml @@ -131,5 +131,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/charts/casskop/crds/db.orange.com_cassandraclusters.yaml b/charts/casskop/crds/db.orange.com_cassandraclusters.yaml index c234df9f..37e62972 100644 --- a/charts/casskop/crds/db.orange.com_cassandraclusters.yaml +++ b/charts/casskop/crds/db.orange.com_cassandraclusters.yaml @@ -2156,5 +2156,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/charts/casskop/crds/db.orange.com_cassandrarestores.yaml b/charts/casskop/crds/db.orange.com_cassandrarestores.yaml index 328a043a..c26dba4d 100644 --- a/charts/casskop/crds/db.orange.com_cassandrarestores.yaml +++ b/charts/casskop/crds/db.orange.com_cassandrarestores.yaml @@ -139,5 +139,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/charts/multi-casskop/crds/db.orange.com_cassandrabackups.yaml b/charts/multi-casskop/crds/db.orange.com_cassandrabackups.yaml index f7bfb683..9309e0ae 100644 --- a/charts/multi-casskop/crds/db.orange.com_cassandrabackups.yaml +++ b/charts/multi-casskop/crds/db.orange.com_cassandrabackups.yaml @@ -131,5 +131,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml b/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml index c234df9f..37e62972 100644 --- a/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml +++ b/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml @@ -2156,5 +2156,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/charts/multi-casskop/crds/db.orange.com_cassandrarestores.yaml b/charts/multi-casskop/crds/db.orange.com_cassandrarestores.yaml index 328a043a..c26dba4d 100644 --- a/charts/multi-casskop/crds/db.orange.com_cassandrarestores.yaml +++ b/charts/multi-casskop/crds/db.orange.com_cassandrarestores.yaml @@ -139,5 +139,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/config/crd/bases/db.orange.com_cassandrabackups.yaml b/config/crd/bases/db.orange.com_cassandrabackups.yaml index f7bfb683..9309e0ae 100644 --- a/config/crd/bases/db.orange.com_cassandrabackups.yaml +++ b/config/crd/bases/db.orange.com_cassandrabackups.yaml @@ -131,5 +131,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/config/crd/bases/db.orange.com_cassandraclusters.yaml b/config/crd/bases/db.orange.com_cassandraclusters.yaml index c234df9f..37e62972 100644 --- a/config/crd/bases/db.orange.com_cassandraclusters.yaml +++ b/config/crd/bases/db.orange.com_cassandraclusters.yaml @@ -2156,5 +2156,3 @@ spec: type: string served: true storage: true - subresources: - status: {} diff --git a/config/crd/bases/db.orange.com_cassandrarestores.yaml b/config/crd/bases/db.orange.com_cassandrarestores.yaml index 328a043a..c26dba4d 100644 --- a/config/crd/bases/db.orange.com_cassandrarestores.yaml +++ b/config/crd/bases/db.orange.com_cassandrarestores.yaml @@ -139,5 +139,3 @@ spec: type: string served: true storage: true - subresources: - status: {}