Skip to content

Issue #613 - Don't delete CRD #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexmt merged 1 commit into from
Sep 21, 2018
Merged

Issue #613 - Don't delete CRD #630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions util/kube/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,12 @@ func GetLiveResource(dclient dynamic.Interface, obj *unstructured.Unstructured,
return liveObj, nil
}

func IsCRDGroupVersionKind(gvk schema.GroupVersionKind) bool {
return gvk.Kind == CustomResourceDefinitionKind && gvk.Group == "apiextensions.k8s.io"
}

func IsCRD(obj *unstructured.Unstructured) bool {
return obj.GroupVersionKind().Kind == CustomResourceDefinitionKind && obj.GroupVersionKind().Group == "apiextensions.k8s.io"
return IsCRDGroupVersionKind(obj.GroupVersionKind())
}

func WatchResourcesWithLabel(ctx context.Context, config *rest.Config, namespace string, labelName string) (chan watch.Event, error) {
Expand Down Expand Up @@ -399,7 +403,7 @@ func DeleteResourceWithLabel(config *rest.Config, namespace string, labelName st
return err
}

if deleteCollectionSupported || deleteSupported {
if deleteCollectionSupported || deleteSupported && !IsCRDGroupVersionKind(schema.FromAPIVersionAndKind(apiResourcesList.GroupVersion, apiResource.Kind)) {
resourceInterfaces = append(resourceInterfaces, resClient{
dclient.Resource(&apiResource, namespace),
deleteCollectionSupported,
Expand Down