DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

srevert some e2e changes

Browse source
This commit is contained in:
James Strong 2023-12-07 18:14:04 -05:00
parent f2664dfff7
commit 3906486007
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/e2e/annotations/grpc.go
View file

@ -40,8 +40,6 @@ const echoHost = "echo"
var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() { var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
f := framework.NewDefaultFramework("grpc", framework.WithHTTPBunEnabled()) f := framework.NewDefaultFramework("grpc", framework.WithHTTPBunEnabled())
nginxIPsecure := f.GetNginxIP() + ":443"
ginkgo.It("should use grpc_pass in the configuration file", func() { ginkgo.It("should use grpc_pass in the configuration file", func() {
f.NewGRPCFortuneTellerDeployment() f.NewGRPCFortuneTellerDeployment()
@ -105,7 +103,8 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
return strings.Contains(server, "grpc_pass grpc://upstream_balancer;") return strings.Contains(server, "grpc_pass grpc://upstream_balancer;")
}) })
conn, err := grpc.Dial(nginxIPsecure, //nolint:goconst //string interpolation
conn, err := grpc.Dial(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,
@ -166,7 +165,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
return strings.Contains(server, "grpc_pass grpc://upstream_balancer;") return strings.Contains(server, "grpc_pass grpc://upstream_balancer;")
}) })
conn, err := grpc.Dial(nginxIPsecure, conn, err := grpc.Dial(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,
@ -240,7 +239,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
return strings.Contains(server, "grpc_pass grpcs://upstream_balancer;") return strings.Contains(server, "grpc_pass grpcs://upstream_balancer;")
}) })
conn, err := grpc.Dial(nginxIPsecure, conn, err := grpc.Dial(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,