-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2727 from diazjf/add-more-e2e
Add e2e tests for Client-Body-Buffer-Size
- Loading branch information
Showing
1 changed file
with
292 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,292 @@ | ||
| /* | ||
| Copyright 2018 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 annotations | ||
|
|
||
| import ( | ||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
|
|
||
| v1beta1 "k8s.io/api/extensions/v1beta1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
|
|
||
| "k8s.io/ingress-nginx/test/e2e/framework" | ||
| ) | ||
|
|
||
| var _ = framework.IngressNginxDescribe("Annotations - Client-Body-Buffer-Size", func() { | ||
| f := framework.NewDefaultFramework("proxy") | ||
|
|
||
| BeforeEach(func() { | ||
| err := f.NewEchoDeploymentWithReplicas(2) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| }) | ||
|
|
||
| It("should set client_body_buffer_size to 1000", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1000", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring("client_body_buffer_size 1000;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("should set client_body_buffer_size to 1K", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1K", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring("client_body_buffer_size 1K;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("should set client_body_buffer_size to 1k", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1k", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring("client_body_buffer_size 1k;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("should set client_body_buffer_size to 1M", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1M", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring("client_body_buffer_size 1M;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("should set client_body_buffer_size to 1M", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1M", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring("client_body_buffer_size 1M;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("should not set client_body_buffer_size to invalid 1b", func() { | ||
| host := "proxy.foo.com" | ||
|
|
||
| ing, err := f.EnsureIngress(&v1beta1.Ingress{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: host, | ||
| Namespace: f.IngressController.Namespace, | ||
| Annotations: map[string]string{ | ||
| "nginx.ingress.kubernetes.io/client-body-buffer-size": "1b", | ||
| }, | ||
| }, | ||
| Spec: v1beta1.IngressSpec{ | ||
| Rules: []v1beta1.IngressRule{ | ||
| { | ||
| Host: host, | ||
| IngressRuleValue: v1beta1.IngressRuleValue{ | ||
| HTTP: &v1beta1.HTTPIngressRuleValue{ | ||
| Paths: []v1beta1.HTTPIngressPath{ | ||
| { | ||
| Path: "/", | ||
| Backend: v1beta1.IngressBackend{ | ||
| ServiceName: "http-svc", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(ing).NotTo(BeNil()) | ||
|
|
||
| err = f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).ShouldNot(ContainSubstring("client_body_buffer_size 1b;")) | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
| }) |