This commit is contained in:
Josh Soref 2020-11-27 12:26:53 -05:00
parent fe65e9d22f
commit a8728f3d2c
38 changed files with 1120 additions and 1120 deletions

File diff suppressed because it is too large Load diff

View file

@ -145,7 +145,7 @@ var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
},
},
{
Path: "/somewhereelese",
Path: "/somewhereelse",
Backend: networking.IngressBackend{
ServiceName: framework.EchoService,
ServicePort: intstr.FromInt(80),
@ -172,11 +172,11 @@ var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
Header("Set-Cookie").Contains("Path=/something")
f.HTTPTestClient().
GET("/somewhereelese").
GET("/somewhereelse").
WithHeader("Host", host).
Expect().
Status(http.StatusOK).
Header("Set-Cookie").Contains("Path=/somewhereelese")
Header("Set-Cookie").Contains("Path=/somewhereelse")
})
ginkgo.It("should set cookie with expires", func() {

View file

@ -100,7 +100,7 @@ var _ = framework.DescribeAnnotation("influxdb-*", func() {
func createInfluxDBService(f *framework.Framework) *corev1.Service {
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "inflxudb",
Name: "influxdb",
Namespace: f.Namespace,
},
Spec: corev1.ServiceSpec{Ports: []corev1.ServicePort{

View file

@ -156,12 +156,12 @@ var _ = framework.DescribeAnnotation("proxy-*", func() {
ginkgo.It("should turn on proxy-buffering", func() {
proxyBuffering := "on"
proxyBufersNumber := "8"
proxyBuffersNumber := "8"
proxyBufferSize := "8k"
annotations := make(map[string]string)
annotations["nginx.ingress.kubernetes.io/proxy-buffering"] = proxyBuffering
annotations["nginx.ingress.kubernetes.io/proxy-buffers-number"] = proxyBufersNumber
annotations["nginx.ingress.kubernetes.io/proxy-buffers-number"] = proxyBuffersNumber
annotations["nginx.ingress.kubernetes.io/proxy-buffer-size"] = proxyBufferSize
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
@ -171,7 +171,7 @@ var _ = framework.DescribeAnnotation("proxy-*", func() {
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("proxy_buffering %s;", proxyBuffering)) &&
strings.Contains(server, fmt.Sprintf("proxy_buffer_size %s;", proxyBufferSize)) &&
strings.Contains(server, fmt.Sprintf("proxy_buffers %s %s;", proxyBufersNumber, proxyBufferSize)) &&
strings.Contains(server, fmt.Sprintf("proxy_buffers %s %s;", proxyBuffersNumber, proxyBufferSize)) &&
strings.Contains(server, fmt.Sprintf("proxy_request_buffering %s;", proxyBuffering))
})
})

View file

@ -385,11 +385,11 @@ func (f *Framework) waitForReload(fn func()) {
}
func getReloadCount(pod *corev1.Pod, namespace string, client kubernetes.Interface) int {
evnts, err := client.CoreV1().Events(namespace).Search(scheme.Scheme, pod)
events, err := client.CoreV1().Events(namespace).Search(scheme.Scheme, pod)
assert.Nil(ginkgo.GinkgoT(), err, "obtaining NGINX Pod")
reloadCount := 0
for _, e := range evnts.Items {
for _, e := range events.Items {
if e.Reason == "RELOAD" && e.Type == corev1.EventTypeNormal {
reloadCount++
}

View file

@ -61,7 +61,7 @@ func (f *Framework) EnsureConfigMap(configMap *api.ConfigMap) (*api.ConfigMap, e
return cm, nil
}
// GetIngress gets an Ingress object from the given namespace, name and retunrs it, throws error if it does not exists.
// GetIngress gets an Ingress object from the given namespace, name and returns it, throws error if it does not exists.
func (f *Framework) GetIngress(namespace string, name string) *networking.Ingress {
ing, err := f.KubeClientSet.NetworkingV1beta1().Ingresses(namespace).Get(context.TODO(), name, metav1.GetOptions{})
assert.Nil(ginkgo.GinkgoT(), err, "getting ingress")
@ -69,7 +69,7 @@ func (f *Framework) GetIngress(namespace string, name string) *networking.Ingres
return ing
}
// EnsureIngress creates an Ingress object and retunrs it, throws error if it already exists.
// EnsureIngress creates an Ingress object and returns it, throws error if it already exists.
func (f *Framework) EnsureIngress(ingress *networking.Ingress) *networking.Ingress {
fn := func() {
err := createIngressWithRetries(f.KubeClientSet, f.Namespace, ingress)
@ -102,7 +102,7 @@ func (f *Framework) UpdateIngress(ingress *networking.Ingress) *networking.Ingre
return ing
}
// EnsureService creates a Service object and retunrs it, throws error if it already exists.
// EnsureService creates a Service object and returns it, throws error if it already exists.
func (f *Framework) EnsureService(service *core.Service) *core.Service {
err := createServiceWithRetries(f.KubeClientSet, f.Namespace, service)
assert.Nil(ginkgo.GinkgoT(), err, "creating service")
@ -114,7 +114,7 @@ func (f *Framework) EnsureService(service *core.Service) *core.Service {
return s
}
// EnsureDeployment creates a Deployment object and retunrs it, throws error if it already exists.
// EnsureDeployment creates a Deployment object and returns it, throws error if it already exists.
func (f *Framework) EnsureDeployment(deployment *appsv1.Deployment) *appsv1.Deployment {
err := createDeploymentWithRetries(f.KubeClientSet, f.Namespace, deployment)
assert.Nil(ginkgo.GinkgoT(), err, "creating deployment")

View file

@ -54,7 +54,7 @@ var _ = framework.IngressNginxDescribe("[Ingress] [PathType] exact", func() {
"nginx.ingress.kubernetes.io/configuration-snippet": `more_set_input_headers "pathType: prefix";`,
}
ing = framework.NewSingleIngress("exact-sufix", "/exact", host, f.Namespace, framework.EchoService, 80, annotations)
ing = framework.NewSingleIngress("exact-suffix", "/exact", host, f.Namespace, framework.EchoService, 80, annotations)
f.EnsureIngress(ing)
f.WaitForNginxServer(host,
@ -76,7 +76,7 @@ var _ = framework.IngressNginxDescribe("[Ingress] [PathType] exact", func() {
assert.Contains(ginkgo.GinkgoT(), body, "pathtype=exact")
body = f.HTTPTestClient().
GET("/exact/sufix").
GET("/exact/suffix").
WithHeader("Host", host).
Expect().
Status(http.StatusOK).
@ -103,7 +103,7 @@ var _ = framework.IngressNginxDescribe("[Ingress] [PathType] exact", func() {
})
body = f.HTTPTestClient().
GET("/exact/sufix").
GET("/exact/suffix").
WithHeader("Host", host).
Expect().
Status(http.StatusOK).

View file

@ -69,7 +69,7 @@ var _ = framework.IngressNginxDescribe("[Memory Leak] Dynamic Certificates", fun
})
})
func privisionIngress(hostname string, f *framework.Framework) {
func provisionIngress(hostname string, f *framework.Framework) {
ing := f.EnsureIngress(framework.NewSingleIngressWithTLS(hostname, "/", hostname, []string{hostname}, f.Namespace, framework.EchoService, 80, nil))
_, err := framework.CreateIngressTLSSecret(f.KubeClientSet,
ing.Spec.TLS[0].Hosts,
@ -114,7 +114,7 @@ func run(host string, f *framework.Framework) pool.WorkFunc {
}
ginkgo.By(fmt.Sprintf("\tcreating ingress for host %v", host))
privisionIngress(host, f)
provisionIngress(host, f)
framework.Sleep(100 * time.Millisecond)

View file

@ -37,7 +37,7 @@ import (
var _ = framework.IngressNginxDescribe("[Service] Type ExternalName", func() {
f := framework.NewDefaultFramework("type-externalname")
ginkgo.It("works with external name set to incomplete fdqn", func() {
ginkgo.It("works with external name set to incomplete fqdn", func() {
f.NewEchoDeployment()
host := "echo"

View file

@ -285,7 +285,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -392,7 +392,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -470,7 +470,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -582,7 +582,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -660,7 +660,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",

View file

@ -285,7 +285,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -392,7 +392,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -470,7 +470,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -582,7 +582,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -631,7 +631,7 @@
},
"proxy": {
"bodySize": "1m",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",

View file

@ -135,7 +135,7 @@
},
"proxy": {
"bodySize": "1g",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",
@ -235,7 +235,7 @@
},
"proxy": {
"bodySize": "1g",
"conectTimeout": 5,
"connectTimeout": 5,
"sendTimeout": 60,
"readTimeout": 60,
"bufferSize": "4k",