From d820bc5e72b3fd7fc975a3db720cb1963b87fcc8 Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Fri, 2 Oct 2020 09:48:12 -0400 Subject: [PATCH] restore proper lowercase/plural CRD resource (#2949) * restore proper lowercase/plural CRD resource This commit restores the proper resource string "customresourcedefinitions" for CRD. The prior change to "CustomResourceDefinition" was made because this was being used in another place to populate the CRD "Kind" field in remap_crd_version_action.go -- there, just use the correct Kind string instead of pulling from Resource. Signed-off-by: Scott Seago * add changelog Signed-off-by: Scott Seago --- changelogs/unreleased/2949-sseago | 1 + pkg/backup/remap_crd_version_action.go | 3 +-- pkg/kuberesource/kuberesource.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/2949-sseago diff --git a/changelogs/unreleased/2949-sseago b/changelogs/unreleased/2949-sseago new file mode 100644 index 000000000..9f71b6879 --- /dev/null +++ b/changelogs/unreleased/2949-sseago @@ -0,0 +1 @@ +Restore CRD Resource name to fix CRD wait functionality. diff --git a/pkg/backup/remap_crd_version_action.go b/pkg/backup/remap_crd_version_action.go index eaced726e..b282e876e 100644 --- a/pkg/backup/remap_crd_version_action.go +++ b/pkg/backup/remap_crd_version_action.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - "github.com/vmware-tanzu/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) @@ -111,7 +110,7 @@ func fetchV1beta1CRD(name string, betaCRDClient apiextv1beta1client.CustomResour // See https://github.com/kubernetes/kubernetes/issues/3030. Unsure why this is happening here and not in main Velero; // probably has to do with List calls and Dynamic client vs typed client // Set these all the time, since they shouldn't ever be different, anyway - betaCRD.Kind = kuberesource.CustomResourceDefinitions.Resource + betaCRD.Kind = "CustomResourceDefinition" betaCRD.APIVersion = apiextv1beta1.SchemeGroupVersion.String() m, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&betaCRD) diff --git a/pkg/kuberesource/kuberesource.go b/pkg/kuberesource/kuberesource.go index d3daafe35..a515a70ff 100644 --- a/pkg/kuberesource/kuberesource.go +++ b/pkg/kuberesource/kuberesource.go @@ -23,7 +23,7 @@ import ( var ( ClusterRoleBindings = schema.GroupResource{Group: "rbac.authorization.k8s.io", Resource: "clusterrolebindings"} ClusterRoles = schema.GroupResource{Group: "rbac.authorization.k8s.io", Resource: "clusterroles"} - CustomResourceDefinitions = schema.GroupResource{Group: "apiextensions.k8s.io", Resource: "CustomResourceDefinition"} + CustomResourceDefinitions = schema.GroupResource{Group: "apiextensions.k8s.io", Resource: "customresourcedefinitions"} Jobs = schema.GroupResource{Group: "batch", Resource: "jobs"} Namespaces = schema.GroupResource{Group: "", Resource: "namespaces"} PersistentVolumeClaims = schema.GroupResource{Group: "", Resource: "persistentvolumeclaims"}