From 60e3b13462c315406f5b8addd62acc4f1cf0d50a Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Fri, 28 Feb 2025 11:53:25 +0100 Subject: [PATCH] CRD updates for the oc CLI fields for the NAR, NAB and NABSL objects Implements #232 with additional fields for: - NonAdminBackup - NonAdminRestore - NonAdminBackupStorageLocation Signed-off-by: Michal Pryc --- .../oadp.openshift.io_nonadminbackups.yaml | 12 +++++++++++- ....io_nonadminbackupstoragelocationrequests.yaml | 15 ++++++++++++++- ...enshift.io_nonadminbackupstoragelocations.yaml | 15 ++++++++++++++- ...adp.openshift.io_nonadmindownloadrequests.yaml | 5 ++++- .../oadp.openshift.io_nonadminrestores.yaml | 12 +++++++++++- .../bases/oadp.openshift.io_nonadminbackups.yaml | 12 +++++++++++- ....io_nonadminbackupstoragelocationrequests.yaml | 15 ++++++++++++++- ...enshift.io_nonadminbackupstoragelocations.yaml | 15 ++++++++++++++- ...adp.openshift.io_nonadmindownloadrequests.yaml | 5 ++++- .../bases/oadp.openshift.io_nonadminrestores.yaml | 12 +++++++++++- 10 files changed, 108 insertions(+), 10 deletions(-) diff --git a/bundle/manifests/oadp.openshift.io_nonadminbackups.yaml b/bundle/manifests/oadp.openshift.io_nonadminbackups.yaml index 502280cff83..99c5a66c93c 100644 --- a/bundle/manifests/oadp.openshift.io_nonadminbackups.yaml +++ b/bundle/manifests/oadp.openshift.io_nonadminbackups.yaml @@ -16,7 +16,17 @@ spec: singular: nonadminbackup scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroBackup.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackup is the Schema for the nonadminbackups API diff --git a/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml b/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml index d68f0a2bd9a..ea73079b09d 100644 --- a/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml +++ b/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml @@ -16,7 +16,20 @@ spec: singular: nonadminbackupstoragelocationrequest scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.nonAdminBackupStorageLocation.namespace + name: Request-Namespace + type: string + - jsonPath: .status.nonAdminBackupStorageLocation.name + name: Request-Name + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackupStorageLocationRequest is the Schema for the nonadminbackupstoragelocationrequests diff --git a/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocations.yaml b/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocations.yaml index 64bffb47bfc..586fab7c6b0 100644 --- a/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocations.yaml +++ b/bundle/manifests/oadp.openshift.io_nonadminbackupstoragelocations.yaml @@ -16,7 +16,20 @@ spec: singular: nonadminbackupstoragelocation scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.conditions[?(@.type=='ClusterAdminApproved')].status + name: Request-Approved + type: string + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroBackupStorageLocation.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackupStorageLocation is the Schema for the nonadminbackupstoragelocations diff --git a/bundle/manifests/oadp.openshift.io_nonadmindownloadrequests.yaml b/bundle/manifests/oadp.openshift.io_nonadmindownloadrequests.yaml index e3d6d6dd6cc..eef39d585cd 100644 --- a/bundle/manifests/oadp.openshift.io_nonadmindownloadrequests.yaml +++ b/bundle/manifests/oadp.openshift.io_nonadmindownloadrequests.yaml @@ -18,8 +18,11 @@ spec: versions: - additionalPrinterColumns: - jsonPath: .status.phase - name: Status + name: Request-Phase type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha1 schema: openAPIV3Schema: diff --git a/bundle/manifests/oadp.openshift.io_nonadminrestores.yaml b/bundle/manifests/oadp.openshift.io_nonadminrestores.yaml index 49898c7dc92..f01daad1a80 100644 --- a/bundle/manifests/oadp.openshift.io_nonadminrestores.yaml +++ b/bundle/manifests/oadp.openshift.io_nonadminrestores.yaml @@ -16,7 +16,17 @@ spec: singular: nonadminrestore scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroRestore.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminRestore is the Schema for the nonadminrestores API diff --git a/config/crd/bases/oadp.openshift.io_nonadminbackups.yaml b/config/crd/bases/oadp.openshift.io_nonadminbackups.yaml index 321bd31f590..eed49a7b888 100644 --- a/config/crd/bases/oadp.openshift.io_nonadminbackups.yaml +++ b/config/crd/bases/oadp.openshift.io_nonadminbackups.yaml @@ -16,7 +16,17 @@ spec: singular: nonadminbackup scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroBackup.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackup is the Schema for the nonadminbackups API diff --git a/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml b/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml index b6a7685c64f..ebcc64b32b0 100644 --- a/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml +++ b/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml @@ -16,7 +16,20 @@ spec: singular: nonadminbackupstoragelocationrequest scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.nonAdminBackupStorageLocation.namespace + name: Request-Namespace + type: string + - jsonPath: .status.nonAdminBackupStorageLocation.name + name: Request-Name + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackupStorageLocationRequest is the Schema for the nonadminbackupstoragelocationrequests diff --git a/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml b/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml index c697d653986..7e1c9cb713a 100644 --- a/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml +++ b/config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml @@ -16,7 +16,20 @@ spec: singular: nonadminbackupstoragelocation scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.conditions[?(@.type=='ClusterAdminApproved')].status + name: Request-Approved + type: string + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroBackupStorageLocation.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminBackupStorageLocation is the Schema for the nonadminbackupstoragelocations diff --git a/config/crd/bases/oadp.openshift.io_nonadmindownloadrequests.yaml b/config/crd/bases/oadp.openshift.io_nonadmindownloadrequests.yaml index 02e672b9585..fd503d1e19c 100644 --- a/config/crd/bases/oadp.openshift.io_nonadmindownloadrequests.yaml +++ b/config/crd/bases/oadp.openshift.io_nonadmindownloadrequests.yaml @@ -18,8 +18,11 @@ spec: versions: - additionalPrinterColumns: - jsonPath: .status.phase - name: Status + name: Request-Phase type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date name: v1alpha1 schema: openAPIV3Schema: diff --git a/config/crd/bases/oadp.openshift.io_nonadminrestores.yaml b/config/crd/bases/oadp.openshift.io_nonadminrestores.yaml index 26b3f116daa..cb39b58f354 100644 --- a/config/crd/bases/oadp.openshift.io_nonadminrestores.yaml +++ b/config/crd/bases/oadp.openshift.io_nonadminrestores.yaml @@ -16,7 +16,17 @@ spec: singular: nonadminrestore scope: Namespaced versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Request-Phase + type: string + - jsonPath: .status.veleroRestore.status.phase + name: Velero-Phase + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: description: NonAdminRestore is the Schema for the nonadminrestores API