Merge pull request #5201 from SzekeresB/dev/proxy-config

Added TC for proxy connect, read, and send timeout

test/e2e/annotations/proxy.go

@@ -149,8 +149,8 @@ var _ = framework.DescribeAnnotation("proxy-*", func() {
 		f.WaitForNginxServer(host,
 			func(server string) bool {
 				return !strings.Contains(server, fmt.Sprintf("proxy_connect_timeout %ss;", proxyConnectTimeout)) &&
-					!strings.Contains(server, fmt.Sprintf("proxy_connect_timeout %ss;", proxyConnectTimeout)) &&
+					!strings.Contains(server, fmt.Sprintf("proxy_send_timeout %ss;", proxySendTimeout)) &&
-					!strings.Contains(server, fmt.Sprintf("proxy_connect_timeout %ss;", proxyConnectTimeout))
+					!strings.Contains(server, fmt.Sprintf("proxy_read_timeout %ss;", proxyReadtimeout))
 			})
 	})
 

test/e2e/settings/proxy_connect_timeout.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package settings
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/onsi/ginkgo"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.DescribeSetting("proxy-connect-timeout", func() {
+	f := framework.NewDefaultFramework("proxy")
+	host := "proxy-connect-timeout.com"
+
+	ginkgo.BeforeEach(func() {
+		f.NewEchoDeployment()
+	})
+
+	ginkgo.It("should set valid proxy timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxyConnectTimeout := "50"
+
+		cm := make(map[string]string)
+		cm["proxy-connect-timeout"] = proxyConnectTimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return strings.Contains(server, fmt.Sprintf("proxy_connect_timeout %ss;", proxyConnectTimeout))
+			})
+	})
+
+	ginkgo.It("should not set invalid proxy timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxyConnectTimeout := "50k"
+
+		cm := make(map[string]string)
+		cm["proxy-connect-timeout"] = proxyConnectTimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return !strings.Contains(server, fmt.Sprintf("proxy_connect_timeout %ss;", proxyConnectTimeout))
+			})
+	})
+
+})

test/e2e/settings/proxy_read_timeout.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package settings
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/onsi/ginkgo"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.DescribeSetting("proxy-read-timeout", func() {
+	f := framework.NewDefaultFramework("proxy")
+	host := "proxy-read-timeout.com"
+
+	ginkgo.BeforeEach(func() {
+		f.NewEchoDeployment()
+	})
+
+	ginkgo.It("should set valid proxy read timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxyReadtimeout := "20"
+
+		cm := make(map[string]string)
+		cm["proxy-read-timeout"] = proxyReadtimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return strings.Contains(server, fmt.Sprintf("proxy_read_timeout %ss;", proxyReadtimeout))
+			})
+	})
+
+	ginkgo.It("should not set invalid proxy read timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxyReadtimeout := "20k"
+
+		cm := make(map[string]string)
+		cm["proxy-read-timeout"] = proxyReadtimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return !strings.Contains(server, fmt.Sprintf("proxy_read_timeout %ss;", proxyReadtimeout))
+			})
+	})
+
+})

test/e2e/settings/proxy_send_timeout.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package settings
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/onsi/ginkgo"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.DescribeSetting("proxy-send-timeout", func() {
+	f := framework.NewDefaultFramework("proxy")
+	host := "proxy-send-timeout.com"
+
+	ginkgo.BeforeEach(func() {
+		f.NewEchoDeployment()
+	})
+
+	ginkgo.It("should set valid proxy send timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxySendTimeout := "20"
+
+		cm := make(map[string]string)
+		cm["proxy-send-timeout"] = proxySendTimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return strings.Contains(server, fmt.Sprintf("proxy_send_timeout %ss;", proxySendTimeout))
+			})
+	})
+
+	ginkgo.It("should not set invalid proxy send timeouts using configmap values", func() {
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+
+		proxySendTimeout := "20k"
+
+		cm := make(map[string]string)
+		cm["proxy-send-timeout"] = proxySendTimeout
+		f.SetNginxConfigMapData(cm)
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return !strings.Contains(server, fmt.Sprintf("proxy_send_timeout %ss;", proxySendTimeout))
+			})
+	})
+
+})