mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-01 12:56:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove IsUnstructuredCRDReady (#4085)

Browse Source 
This commit removes `IsUnstructuredCRDReady` since
kubernetes/kubernetes#87675 is fixed.
Is uses `Is1CRDReady` to check the readiness of CRD.

After v1.7 we may consider merge the funcx `IsV1Beta1CRDReady` and
`IsV1CRDReady`

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
This commit is contained in:
Daniel Jiang
2021-09-01 13:38:17 +08:00
committed by GitHub
parent 8abc80ec41
commit 746cd616fd
3 changed files with 103 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/restore/restore.go
+1 -6
View File
@@ -842,12 +842,7 @@ func (ctx *restoreContext) crdAvailable(name string, crdClient client.Dynamic) (
if err != nil {
return true, err
}
// TODO: Due to upstream conversion issues in runtime.FromUnstructured,
// we use the unstructured object here. Once the upstream conversion
// functions are fixed, we should convert to the CRD types and use
// IsCRDReady.
available, err = kube.IsUnstructuredCRDReady(unstructuredCRD)
available, err = kube.IsCRDReady(unstructuredCRD)
if err != nil {
return true, err
}