test: make rate limit e2e less flaky (envoyproxy#1452)

**Description**
Since envoyproxy#1410, the deployment created by EG for the rate limit server is
in crashing loop until redis server is up and running in the rate limit
e2e test setup, which caused a bit of flake in the test. This fixes it
by restarting the deployment just in case.

This also removes the only remaining use of t.Context in test cleanup
function in e2e tests.

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

Makefile

@@ -32,7 +32,7 @@ HELM_CHART_VERSION ?= v0.0.0-latest
 # `GO_TEST_ARGS="-run TestName/foo/etc -v -race"`.
 GO_TEST_ARGS ?=
 # Arguments for go test in e2e tests in addition to GO_TEST_ARGS, applicable to test-e2e, test-extproc, and test-controller.
-GO_TEST_E2E_ARGS ?= -count=1
+GO_TEST_E2E_ARGS ?= -count=1 -timeout 30m
 
 ## help: Show this help info.
 .PHONY: help
@@ -200,7 +200,7 @@ test-e2e-namespaced: build-e2e
 .PHONY: test-e2e-aigw
 test-e2e-aigw: build.aigw ## Run the end-to-end tests for the aigw CLI.
 	@echo "Run aigw CLI E2E tests"
-	@go test -v ./tests/e2e-aigw/... -timeout 30m $(GO_TEST_E2E_ARGS)
+	@go test -v ./tests/e2e-aigw/... $(GO_TEST_E2E_ARGS)
 
 ##@ Common
 

tests/e2e/cross_namespace_test.go

@@ -28,7 +28,7 @@ func TestCrossNamespace(t *testing.T) {
 	const manifest = "testdata/cross_namespace.yaml"
 	require.NoError(t, e2elib.KubectlApplyManifest(t.Context(), manifest))
 	t.Cleanup(func() {
-		_ = e2elib.KubectlDeleteManifest(t.Context(), manifest)
+		_ = e2elib.KubectlDeleteManifest(context.Background(), manifest)
 	})
 
 	// Wait for the Gateway pod to be ready with the correct selector.

tests/e2e/token_ratelimit_test.go

@@ -55,6 +55,9 @@ func Test_Examples_TokenRateLimit(t *testing.T) {
 	e2elib.RequireWaitForGatewayPodReady(t, egSelector)
 
 	// Wait for the redis pod to be ready so that the rate limit can be performed correctly.
+	// Until the redis pod is ready, envoy-ratelimit deployment will be in CrashLoopBackOff, so restart it so
+	// we can have it up and running faster in a clean state.
+	require.NoError(t, e2elib.KubectlRestartDeployment(t.Context(), e2elib.EnvoyGatewayNamespace, "envoy-ratelimit"))
 	e2elib.RequireWaitForPodReady(t, e2elib.EnvoyGatewayNamespace, "app.kubernetes.io/component=ratelimit")
 	e2elib.RequireWaitForPodReady(t, "redis-system", "app=redis")
 

tests/internal/e2elib/e2elib.go

@@ -458,7 +458,7 @@ func InstallOrUpgradeAIGateway(ctx context.Context, aigw AIGatewayHelmOption) (e
 	}
 	// Restart the controller to pick up the new changes in the AI Gateway.
 	initLog("\tRestart AI Gateway controller")
-	if err = kubectlRestartDeployment(ctx, "envoy-ai-gateway-system", "ai-gateway-controller"); err != nil {
+	if err = KubectlRestartDeployment(ctx, "envoy-ai-gateway-system", "ai-gateway-controller"); err != nil {
 		return
 	}
 	return kubectlWaitForDeploymentReady(ctx, "envoy-ai-gateway-system", "ai-gateway-controller")
@@ -505,7 +505,7 @@ func KubectlDeleteManifest(ctx context.Context, manifest string) (err error) {
 	return cmd.Run()
 }
 
-func kubectlRestartDeployment(ctx context.Context, namespace, deployment string) error {
+func KubectlRestartDeployment(ctx context.Context, namespace, deployment string) error {
 	cmd := Kubectl(ctx, "rollout", "restart", "deployment/"+deployment, "-n", namespace)
 	return cmd.Run()
 }