rlp e2e tests: fix sync issues

Kuadrant · Nov 24, 2023 · 541b35f · 541b35f
1 parent 099f4f2
commit 541b35f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/controllers/ratelimitpolicy_controller_test.go b/controllers/ratelimitpolicy_controller_test.go
@@ -5,7 +5,6 @@ package controllers
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -143,8 +142,8 @@ var _ = Describe("RateLimitPolicy controller", func() {
 			}))
 
 			// Check wasm plugin
-			wpName := fmt.Sprintf("kuadrant-%s", gwName)
-			wasmPluginKey := client.ObjectKey{Name: wpName, Namespace: testNamespace}
+			wasmPluginKey := client.ObjectKey{Name: rlptools.WASMPluginName(gateway), Namespace: testNamespace}
+			Eventually(testWasmPluginIsAvailable(wasmPluginKey), time.Minute, 5*time.Second).To(BeTrue())
 			existingWasmPlugin := &istioclientgoextensionv1alpha1.WasmPlugin{}
 			err = k8sClient.Get(context.Background(), wasmPluginKey, existingWasmPlugin)
 			// must exist
@@ -312,8 +311,8 @@ var _ = Describe("RateLimitPolicy controller", func() {
 			Eventually(testRLPIsAvailable(rlpKey), time.Minute, 5*time.Second).Should(BeTrue())
 
 			// Check wasm plugin
-			wpName := fmt.Sprintf("kuadrant-%s", gwName)
-			wasmPluginKey := client.ObjectKey{Name: wpName, Namespace: testNamespace}
+			wasmPluginKey := client.ObjectKey{Name: rlptools.WASMPluginName(gateway), Namespace: testNamespace}
+			Eventually(testWasmPluginIsAvailable(wasmPluginKey), time.Minute, 5*time.Second).To(BeTrue())
 			existingWasmPlugin := &istioclientgoextensionv1alpha1.WasmPlugin{}
 			err = k8sClient.Get(context.Background(), wasmPluginKey, existingWasmPlugin)
 			// must exist
@@ -482,8 +481,8 @@ var _ = Describe("RateLimitPolicy controller", func() {
 			}))
 
 			// Check wasm plugin
-			wpName := fmt.Sprintf("kuadrant-%s", gwName)
-			wasmPluginKey := client.ObjectKey{Name: wpName, Namespace: testNamespace}
+			wasmPluginKey := client.ObjectKey{Name: rlptools.WASMPluginName(gateway), Namespace: testNamespace}
+			Eventually(testWasmPluginIsAvailable(wasmPluginKey), time.Minute, 5*time.Second).To(BeTrue())
 			existingWasmPlugin := &istioclientgoextensionv1alpha1.WasmPlugin{}
 			err = k8sClient.Get(context.Background(), wasmPluginKey, existingWasmPlugin)
 			// must exist
@@ -600,8 +599,9 @@ var _ = Describe("RateLimitPolicy controller", func() {
 			}))
 
 			// Check wasm plugin
-			wpName := fmt.Sprintf("kuadrant-%s", gwName)
-			wasmPluginKey := client.ObjectKey{Name: wpName, Namespace: testNamespace}
+			wasmPluginKey := client.ObjectKey{Name: rlptools.WASMPluginName(gateway), Namespace: testNamespace}
+			// Wait a bit to catch cases where wasmplugin is created and takes a bit to be created
+			Eventually(testWasmPluginIsAvailable(wasmPluginKey), 20*time.Second, 5*time.Second).To(BeFalse())
 			existingWasmPlugin := &istioclientgoextensionv1alpha1.WasmPlugin{}
 			// must not exist
 			err = k8sClient.Get(context.Background(), wasmPluginKey, existingWasmPlugin)
@@ -633,3 +633,21 @@ func testRLPIsAvailable(rlpKey client.ObjectKey) func() bool {
 		return true
 	}
 }
+
+func testWasmPluginIsAvailable(key client.ObjectKey) func() bool {
+	return func() bool {
+		wp := &istioclientgoextensionv1alpha1.WasmPlugin{}
+		err := k8sClient.Get(context.Background(), key, wp)
+		if err != nil {
+			return false
+		}
+
+		// Unfortunately, WasmPlugin does not have status yet
+		// Leaving this here for future use
+		//if !meta.IsStatusConditionTrue(wp.Status.Conditions, "Available") {
+		//	return false
+		//}
+
+		return true
+	}
+}
diff --git a/controllers/ratelimitpolicy_istio_wasmplugin.go b/controllers/ratelimitpolicy_istio_wasmplugin.go
@@ -83,7 +83,7 @@ func (r *RateLimitPolicyReconciler) gatewayWASMPlugin(ctx context.Context, gw co
 			APIVersion: "extensions.istio.io/v1alpha1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("kuadrant-%s", gw.Name),
+			Name:      rlptools.WASMPluginName(gw.Gateway),
 			Namespace: gw.Namespace,
 		},
 		Spec: istioextensionsv1alpha1.WasmPlugin{

diff --git a/pkg/rlptools/wasm_utils.go b/pkg/rlptools/wasm_utils.go
@@ -285,3 +285,7 @@ func WASMPluginMutator(existingObj, desiredObj client.Object) (bool, error) {
 
 	return update, nil
 }
+
+func WASMPluginName(gw *gatewayapiv1.Gateway) string {
+	return fmt.Sprintf("kuadrant-%s", gw.Name)
+}