From 1c05bddf9b3f50d7534c73afe3981b4ed0687694 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 13 Feb 2020 16:39:20 -0300 Subject: [PATCH] Enable grpc e2e tests --- test/e2e/annotations/grpc.go | 10 ++-------- test/e2e/framework/deployment.go | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/e2e/annotations/grpc.go b/test/e2e/annotations/grpc.go index f20e03885..15c4dc90d 100644 --- a/test/e2e/annotations/grpc.go +++ b/test/e2e/annotations/grpc.go @@ -39,11 +39,9 @@ import ( var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() { f := framework.NewDefaultFramework("grpc") - BeforeEach(func() { - f.NewGRPCFortuneTellerDeployment() - }) - It("should use grpc_pass in the configuration file", func() { + f.NewGRPCFortuneTellerDeployment() + host := "grpc" annotations := map[string]string{ @@ -67,8 +65,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() { }) It("should return OK for service with backend protocol GRPC", func() { - Skip("GRPC test temporarily disabled") - f.NewGRPCBinDeployment() host := "echo" @@ -127,8 +123,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() { }) It("should return OK for service with backend protocol GRPCS", func() { - Skip("GRPC test temporarily disabled") - f.NewGRPCBinDeployment() host := "echo" diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go index ab2755166..faab5cbb5 100644 --- a/test/e2e/framework/deployment.go +++ b/test/e2e/framework/deployment.go @@ -219,10 +219,12 @@ func (f *Framework) NewGRPCBinDeployment() { { Name: "insecure", ContainerPort: 9000, + Protocol: corev1.ProtocolTCP, }, { Name: "secure", ContainerPort: 9001, + Protocol: corev1.ProtocolTCP, }, }, ReadinessProbe: probe,