From 7ade80ebe356fd0b278f2c51dd59bfb1c90d9ee5 Mon Sep 17 00:00:00 2001 From: Anddd7 Date: Sun, 14 Apr 2024 11:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20uppercase=20for=20protoco?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rootfs/etc/nginx/template/nginx.tmpl | 2 +- test/e2e/annotations/grpc.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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