Make webhook support e2es more robust

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

test/experimental-e2e/experimental_e2e_test.go

@@ -132,11 +132,12 @@ func TestWebhookSupport(t *testing.T) {
 
 	t.Log("By waiting for the catalog to serve its metadata")
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
-		assert.NoError(t, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.GetName()}, extensionCatalog))
+		assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.GetName()}, extensionCatalog))
 		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, ocv1.TypeServing)
-		assert.NotNil(t, cond)
-		assert.Equal(t, metav1.ConditionTrue, cond.Status)
-		assert.Equal(t, ocv1.ReasonAvailable, cond.Reason)
+		if assert.NotNil(ct, cond) {
+			assert.Equal(ct, metav1.ConditionTrue, cond.Status)
+			assert.Equal(ct, ocv1.ReasonAvailable, cond.Reason)
+		}
 	}, pollDuration, pollInterval)
 
 	t.Log("By installing the webhook-operator ClusterExtension")
@@ -173,7 +174,9 @@ func TestWebhookSupport(t *testing.T) {
 			assert.Equal(ct, metav1.ConditionTrue, cond.Status)
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 			assert.Contains(ct, cond.Message, "Installed bundle")
-			assert.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
+			if assert.NotNil(ct, clusterExtension.Status.Install) {
+				assert.NotEmpty(ct, clusterExtension.Status.Install.Bundle)
+			}
 		}
 	}, pollDuration, pollInterval)
 
@@ -198,24 +201,28 @@ func TestWebhookSupport(t *testing.T) {
 	v1Client := dynamicClient.Resource(v1Gvr).Namespace(namespace.GetName())
 
 	t.Log("By checking an invalid CR is rejected by the validating webhook")
-	obj := getWebhookOperatorResource("invalid-test-cr", namespace.GetName(), false)
-	_, err := v1Client.Create(t.Context(), obj, metav1.CreateOptions{})
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "Invalid value: false: Spec.Valid must be true")
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		obj := getWebhookOperatorResource("invalid-test-cr", namespace.GetName(), false)
+		_, err := v1Client.Create(t.Context(), obj, metav1.CreateOptions{})
+		require.Error(ct, err)
+		require.Contains(ct, err.Error(), "Invalid value: false: Spec.Valid must be true")
+	}, pollDuration, pollInterval)
 
 	t.Log("By checking a valid CR is mutated by the mutating webhook")
-	obj = getWebhookOperatorResource("valid-test-cr", namespace.GetName(), true)
-	_, err = v1Client.Create(t.Context(), obj, metav1.CreateOptions{})
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, dynamicClient.Resource(v1Gvr).Namespace(namespace.GetName()).Delete(context.Background(), obj.GetName(), metav1.DeleteOptions{}))
-	})
-	res, err := v1Client.Get(t.Context(), obj.GetName(), metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]interface{}{
-		"valid":  true,
-		"mutate": true,
-	}, res.Object["spec"])
+	obj := getWebhookOperatorResource("valid-test-cr", namespace.GetName(), true)
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		_, err := v1Client.Create(t.Context(), obj, metav1.CreateOptions{})
+		require.NoError(ct, err)
+		t.Cleanup(func() {
+			require.NoError(t, dynamicClient.Resource(v1Gvr).Namespace(namespace.GetName()).Delete(context.Background(), obj.GetName(), metav1.DeleteOptions{}))
+		})
+		res, err := v1Client.Get(t.Context(), obj.GetName(), metav1.GetOptions{})
+		require.NoError(ct, err)
+		require.Equal(ct, map[string]interface{}{
+			"valid":  true,
+			"mutate": true,
+		}, res.Object["spec"])
+	}, pollDuration, pollInterval)
 
 	t.Log("By checking a valid CR is converted to v2 by the conversion webhook")
 	v2Gvr := schema.GroupVersionResource{
@@ -225,14 +232,16 @@ func TestWebhookSupport(t *testing.T) {
 	}
 	v2Client := dynamicClient.Resource(v2Gvr).Namespace(namespace.GetName())
 
-	res, err = v2Client.Get(t.Context(), obj.GetName(), metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, map[string]interface{}{
-		"conversion": map[string]interface{}{
-			"valid":  true,
-			"mutate": true,
-		},
-	}, res.Object["spec"])
+	require.EventuallyWithT(t, func(ct *assert.CollectT) {
+		res, err := v2Client.Get(t.Context(), obj.GetName(), metav1.GetOptions{})
+		require.NoError(ct, err)
+		require.Equal(ct, map[string]interface{}{
+			"conversion": map[string]interface{}{
+				"valid":  true,
+				"mutate": true,
+			},
+		}, res.Object["spec"])
+	}, pollDuration, pollInterval)
 }
 
 func getWebhookOperatorResource(name string, namespace string, valid bool) *unstructured.Unstructured {