Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: fix TestKongRouterFlavorCompatibility e2e test and make it test all Kong Gateway flavors #4988

Merged
merged 1 commit into from
Oct 27, 2023
Merged

tests: fix TestKongRouterFlavorCompatibility e2e test and make it test all Kong Gateway flavors #4988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/e2e/compatibilities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func TestKongRouterFlavorCompatibility(t *testing.T) {
t.Logf("waiting for Kong with %s router to start", rf)
ensureGatewayDeployedWithRouterFlavor(ctx, t, env, proxyDeploymentNN, rf)
t.Logf("running ingress tests to verify that KIC with %s Kong router works", rf)
deployIngressWithEchoBackends(ctx, t, env, numberOfEchoBackends)
verifyIngressWithEchoBackends(ctx, t, env, numberOfEchoBackends)
})
}
Expand Down
9 changes: 9 additions & 0 deletions test/e2e/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,17 @@ func deployIngressWithEchoBackends(ctx context.Context, t *testing.T, env enviro
deployment.Spec.Replicas = lo.ToPtr(int32(noReplicas))
deployment, err := env.Cluster().Client().AppsV1().Deployments(corev1.NamespaceDefault).Create(ctx, deployment, metav1.CreateOptions{})
require.NoError(t, err)
t.Cleanup(func() {
assert.NoError(t, env.Cluster().Client().AppsV1().Deployments(corev1.NamespaceDefault).Delete(ctx, deployment.Name, metav1.DeleteOptions{}))
})

t.Logf("exposing deployment %s via service", deployment.Name)
service := generators.NewServiceForDeployment(deployment, corev1.ServiceTypeClusterIP)
_, err = env.Cluster().Client().CoreV1().Services(corev1.NamespaceDefault).Create(ctx, service, metav1.CreateOptions{})
require.NoError(t, err)
t.Cleanup(func() {
assert.NoError(t, env.Cluster().Client().CoreV1().Services(corev1.NamespaceDefault).Delete(ctx, service.Name, metav1.DeleteOptions{}))
})

t.Logf("creating an ingress for service %s with ingress.class %s", service.Name, ingressClass)
ingress := generators.NewIngressForService(echoPath, map[string]string{
Expand All @@ -461,6 +467,9 @@ func deployIngressWithEchoBackends(ctx context.Context, t *testing.T, env enviro
}, service)
ingress.Spec.IngressClassName = kong.String(ingressClass)
require.NoError(t, clusters.DeployIngress(ctx, env.Cluster(), corev1.NamespaceDefault, ingress))
t.Cleanup(func() {
assert.NoError(t, env.Cluster().Client().NetworkingV1().Ingresses(corev1.NamespaceDefault).Delete(ctx, ingress.Name, metav1.DeleteOptions{}))
})
return ingress
}

Expand Down