Don't error if the CRD is already present

Signed-off-by: Pires <pjpires@gmail.com>

Author: pires

pkg/envtest/crd.go

@@ -27,6 +27,8 @@ import (
 
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -190,8 +192,17 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1beta1.CustomResource
 	// Create each CRD
 	for _, crd := range crds {
 		log.V(1).Info("installing CRD", "crd", crd.Name)
-		if _, err := cs.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd); err != nil {
-			return err
+		var err error
+		if _, err = cs.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{}); err != nil {
+			if apierrors.IsNotFound(err) {
+				_, err = cs.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
+			}
+			if apierrors.IsAlreadyExists(err) {
+				_, err = cs.ApiextensionsV1beta1().CustomResourceDefinitions().Update(crd)
+			}
+			if err != nil {
+				return err
+			}
 		}
 	}
 	return nil

pkg/envtest/envtest_test.go

@@ -149,6 +149,13 @@ var _ = Describe("Test", func() {
 			)
 			Expect(err).NotTo(HaveOccurred())
 
+			// Install again to prove we support the scenario where a CRD
+			// already exists.
+			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
+				Paths: []string{filepath.Join(".", "testdata")},
+			})
+			Expect(err).NotTo(HaveOccurred())
+
 			close(done)
 		}, 5)