Merge pull request #1430 from alvaroaleman/deflake

🐛 Deflake should update CRDs if already present in the cluster

pkg/envtest/crd.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 )
@@ -266,8 +267,13 @@ func CreateCRDs(config *rest.Config, crds []client.Object) error {
 			return err
 		default:
 			log.V(1).Info("CRD already exists, updating", "crd", crd.GetName())
-			crd.SetResourceVersion(existingCrd.GetResourceVersion())
-			if err := cs.Update(context.TODO(), crd); err != nil {
+			if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+				if err := cs.Get(context.TODO(), client.ObjectKey{Name: crd.GetName()}, existingCrd); err != nil {
+					return err
+				}
+				crd.SetResourceVersion(existingCrd.GetResourceVersion())
+				return cs.Update(context.TODO(), crd)
+			}); err != nil {
 				return err
 			}
 		}

pkg/envtest/envtest_test.go

@@ -75,7 +75,7 @@ var _ = Describe("Test", func() {
 			Eventually(func() bool {
 				err := c.Get(context.TODO(), crdObjectKey, &placeholder)
 				return apierrors.IsNotFound(err)
-			}, 1*time.Second).Should(BeTrue())
+			}, 5*time.Second).Should(BeTrue())
 		}
 		close(done)
 	}, teardownTimeoutSeconds)