Merge pull request #7571 from moduspwnens/master

Revert "Do not delete templated CRDs"
pull/7582/head
Martin Hickey 6 years ago committed by GitHub
commit 60d8d727c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -209,11 +209,6 @@ func (c *Client) Update(original, target ResourceList, force bool) (*Result, err
} }
for _, info := range original.Difference(target) { for _, info := range original.Difference(target) {
if info.Mapping.GroupVersionKind.Kind == "CustomResourceDefinition" {
c.Log("Skipping the deletion of CustomResourceDefinition %q", info.Name)
continue
}
c.Log("Deleting %q in %s...", info.Name, info.Namespace) c.Log("Deleting %q in %s...", info.Name, info.Namespace)
res.Deleted = append(res.Deleted, info) res.Deleted = append(res.Deleted, info)
if err := deleteResource(info); err != nil { if err := deleteResource(info); err != nil {
@ -236,11 +231,6 @@ func (c *Client) Delete(resources ResourceList) (*Result, []error) {
var errs []error var errs []error
res := &Result{} res := &Result{}
err := perform(resources, func(info *resource.Info) error { err := perform(resources, func(info *resource.Info) error {
if info.Mapping.GroupVersionKind.Kind == "CustomResourceDefinition" {
c.Log("Skipping the deletion of CustomResourceDefinition %q", info.Name)
return nil
}
c.Log("Starting delete for %q %s", info.Name, info.Mapping.GroupVersionKind.Kind) c.Log("Starting delete for %q %s", info.Name, info.Mapping.GroupVersionKind.Kind)
if err := c.skipIfNotFound(deleteResource(info)); err != nil { if err := c.skipIfNotFound(deleteResource(info)); err != nil {
// Collect the error and continue on // Collect the error and continue on

Loading…
Cancel
Save