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

Change default for proxy-add-original-uri-header

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-09-25 10:31:16 -03:00
parent 182de47479
commit 2bd8121338
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/user-guide/nginx-configuration/configmap.md
View file

@ -111,7 +111,7 @@ The following table shows a configuration option's name, type, and the default v
|[use-forwarded-headers](#use-forwarded-headers)|bool|"false"| |[use-forwarded-headers](#use-forwarded-headers)|bool|"false"|
|[forwarded-for-header](#forwarded-for-header)|string|"X-Forwarded-For"| |[forwarded-for-header](#forwarded-for-header)|string|"X-Forwarded-For"|
|[compute-full-forwarded-for](#compute-full-forwarded-for)|bool|"false"| |[compute-full-forwarded-for](#compute-full-forwarded-for)|bool|"false"|
|[proxy-add-original-uri-header](#proxy-add-original-uri-header)|bool|"true"| |[proxy-add-original-uri-header](#proxy-add-original-uri-header)|bool|"false"|
|[generate-request-id](#generate-request-id)|bool|"true"| |[generate-request-id](#generate-request-id)|bool|"true"|
|[enable-opentracing](#enable-opentracing)|bool|"false"| |[enable-opentracing](#enable-opentracing)|bool|"false"|
|[zipkin-collector-host](#zipkin-collector-host)|string|""| |[zipkin-collector-host](#zipkin-collector-host)|string|""|

2
internal/ingress/controller/config/config.go
View file

@ -668,7 +668,7 @@ func NewDefault() Configuration {
UseForwardedHeaders: false, UseForwardedHeaders: false,
ForwardedForHeader: "X-Forwarded-For", ForwardedForHeader: "X-Forwarded-For",
ComputeFullForwardedFor: false, ComputeFullForwardedFor: false,
ProxyAddOriginalURIHeader: true, ProxyAddOriginalURIHeader: false,
GenerateRequestID: true, GenerateRequestID: true,
HTTP2MaxFieldSize: "4k", HTTP2MaxFieldSize: "4k",
HTTP2MaxHeaderSize: "16k", HTTP2MaxHeaderSize: "16k",

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

@ -117,7 +117,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
Expect(err).Should(BeNil()) Expect(err).Should(BeNil())
metadata := res.GetMetadata() metadata := res.GetMetadata()
Expect(metadata["x-original-uri"].Values[0]).Should(Equal("/grpcbin.GRPCBin/HeadersUnary"))
Expect(metadata["content-type"].Values[0]).Should(Equal("application/grpc")) Expect(metadata["content-type"].Values[0]).Should(Equal("application/grpc"))
}) })
@ -179,7 +178,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
Expect(err).Should(BeNil()) Expect(err).Should(BeNil())
metadata := res.GetMetadata() metadata := res.GetMetadata()
Expect(metadata["x-original-uri"].Values[0]).Should(Equal("/grpcbin.GRPCBin/HeadersUnary"))
Expect(metadata["content-type"].Values[0]).Should(Equal("application/grpc")) Expect(metadata["content-type"].Values[0]).Should(Equal("application/grpc"))
}) })
}) })