Return CRD uninstall error

Signed-off-by: Pires <[email protected]>

Author: pires

pkg/envtest/crd.go

@@ -21,6 +21,7 @@ import (
 	"bytes"
 	"io"
 	"io/ioutil"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"os"
 	"path/filepath"
 	"time"
@@ -204,7 +205,10 @@ func UninstallCRDs(config *rest.Config, options CRDInstallOptions) error {
 	for _, crd := range options.CRDs {
 		log.V(1).Info("uninstalling CRD", "crd", crd.Name)
 		if err := cs.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(crd.Name, &metav1.DeleteOptions{}); err != nil {
-			return err
+			// If CRD is not found, we can consider success
+			if !apierrors.IsNotFound(err) {
+				return err
+			}
 		}
 	}
 

pkg/envtest/server.go

@@ -140,8 +140,7 @@ type Environment struct {
 func (te *Environment) Stop() error {
 	if te.CRDInstallOptions.CleanUpAfterUse {
 		if err := UninstallCRDs(te.Config, te.CRDInstallOptions); err != nil {
-			// This error should be harmless so just log it.
-			log.Error(err, "failed to uninstall CRDs")
+			return err
 		}
 	}
 	if te.useExistingCluster() {