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

kubernetes · Sep 25, 2019 · 2bd8121 · 2bd8121
1 parent 182de47
commit 2bd8121
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md
@@ -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"|
 |[forwarded-for-header](#forwarded-for-header)|string|"X-Forwarded-For"|
 |[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"|
 |[enable-opentracing](#enable-opentracing)|bool|"false"|
 |[zipkin-collector-host](#zipkin-collector-host)|string|""|

diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
@@ -668,7 +668,7 @@ func NewDefault() Configuration {
 		UseForwardedHeaders:              false,
 		ForwardedForHeader:               "X-Forwarded-For",
 		ComputeFullForwardedFor:          false,
-		ProxyAddOriginalURIHeader:        true,
+		ProxyAddOriginalURIHeader:        false,
 		GenerateRequestID:                true,
 		HTTP2MaxFieldSize:                "4k",
 		HTTP2MaxHeaderSize:               "16k",

diff --git a/test/e2e/annotations/grpc.go b/test/e2e/annotations/grpc.go
@@ -117,7 +117,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
 		Expect(err).Should(BeNil())
 
 		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"))
 	})
 
@@ -179,7 +178,6 @@ var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
 		Expect(err).Should(BeNil())
 
 		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"))
 	})
 })