diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 1f3f0ee37..93a04e3e6 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -1481,8 +1481,8 @@ stream { proxy_next_upstream_timeout {{ $location.Proxy.NextUpstreamTimeout }}; proxy_next_upstream_tries {{ $location.Proxy.NextUpstreamTries }}; + {{ if or (eq $location.BackendProtocol "GRPC") (eq $location.BackendProtocol "GRPCS") }} # Grpc settings - {{ if or (eq $location.BackendProtocol "GRPC") (eq $location.BackendProtocol "GRPCS")}} grpc_connect_timeout {{ $location.Proxy.ConnectTimeout }}s; grpc_send_timeout {{ $location.Proxy.SendTimeout }}s; grpc_read_timeout {{ $location.Proxy.ReadTimeout }}s; diff --git a/test/e2e/annotations/grpc.go b/test/e2e/annotations/grpc.go index e5aef7971..96cd227d9 100644 --- a/test/e2e/annotations/grpc.go +++ b/test/e2e/annotations/grpc.go @@ -267,7 +267,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() { proxyReadtimeout := "30" annotations := make(map[string]string) - annotations["nginx.ingress.kubernetes.io/backend-protocol"] = "grpc" + annotations["nginx.ingress.kubernetes.io/backend-protocol"] = "GRPC" annotations["nginx.ingress.kubernetes.io/proxy-connect-timeout"] = proxyConnectTimeout annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout @@ -289,7 +289,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() { proxyReadtimeout := "30" annotations := make(map[string]string) - annotations["nginx.ingress.kubernetes.io/backend-protocol"] = "grpcs" + annotations["nginx.ingress.kubernetes.io/backend-protocol"] = "GRPCS" annotations["nginx.ingress.kubernetes.io/proxy-connect-timeout"] = proxyConnectTimeout annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout