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

🐛 fix: uppercase for protocol

Browse source
This commit is contained in:
Anddd7 2024-04-14 11:47:06 +08:00
parent b43137b41d
commit 7ade80ebe3
No known key found for this signature in database
GPG key ID: 10EB2713E5FEFB99
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -1481,8 +1481,8 @@ stream {
proxy_next_upstream_timeout {{ $location.Proxy.NextUpstreamTimeout }}; proxy_next_upstream_timeout {{ $location.Proxy.NextUpstreamTimeout }};
proxy_next_upstream_tries {{ $location.Proxy.NextUpstreamTries }}; proxy_next_upstream_tries {{ $location.Proxy.NextUpstreamTries }};
{{ if or (eq $location.BackendProtocol "GRPC") (eq $location.BackendProtocol "GRPCS") }}
# Grpc settings # Grpc settings
{{ if or (eq $location.BackendProtocol "GRPC") (eq $location.BackendProtocol "GRPCS")}}
grpc_connect_timeout {{ $location.Proxy.ConnectTimeout }}s; grpc_connect_timeout {{ $location.Proxy.ConnectTimeout }}s;
grpc_send_timeout {{ $location.Proxy.SendTimeout }}s; grpc_send_timeout {{ $location.Proxy.SendTimeout }}s;
grpc_read_timeout {{ $location.Proxy.ReadTimeout }}s; grpc_read_timeout {{ $location.Proxy.ReadTimeout }}s;

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

@ -267,7 +267,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
proxyReadtimeout := "30" proxyReadtimeout := "30"
annotations := make(map[string]string) 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-connect-timeout"] = proxyConnectTimeout
annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout
annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout
@ -289,7 +289,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
proxyReadtimeout := "30" proxyReadtimeout := "30"
annotations := make(map[string]string) 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-connect-timeout"] = proxyConnectTimeout
annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = proxySendTimeout
annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout annotations["nginx.ingress.kubernetes.io/proxy-read-timeout"] = proxyReadtimeout