From 2bd8121338e813dcbd3ef895f314684aed634827 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 25 Sep 2019 10:31:16 -0300 Subject: [PATCH] Change default for proxy-add-original-uri-header --- docs/user-guide/nginx-configuration/configmap.md | 2 +- internal/ingress/controller/config/config.go | 2 +- test/e2e/annotations/grpc.go | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md index f8a984c0b..84a10c87b 100755 --- 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 index a286c3267..3a0bb3fd8 100644 --- 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 index 1321e724e..10bb7d4b6 100644 --- 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")) }) })