From b52eb9f65983b9ec8a0e0f7c8ea14fbd4345b86a Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Fri, 11 Apr 2025 12:55:59 +0200 Subject: [PATCH] CRD updates for the oc CLI fields for the NAR, NAB and NABSL objects Change required by the https://github.com/migtools/oadp-non-admin/pull/245 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 fa65827b5db..75df43810be 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 c56f68ac723..0f1f473a48e 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 3db053c9eda..ae737171d4d 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 5398cf40c51..08290cb3fe9 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 7aa7ea39bb7..42d4a9a0506 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 68f87b364b2..4ef8629eda5 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 b7c9d74912a..52013c47678 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 96f20528800..e08f0a5dd03 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 a50a25b571a..4306f7b56ae 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 f0e4244aa0b..2a29371e270 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