forked from kubernetes/ingress-nginx
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
293 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
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
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
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,108 @@ | ||
| /* | ||
| Copyright 2016 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 proxy | ||
|
|
||
| import ( | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
|
|
||
| "github.ibm.com/IBMPrivateCloud/icp-management-ingress/pkg/ingress/annotations/parser" | ||
| "github.ibm.com/IBMPrivateCloud/icp-management-ingress/pkg/ingress/resolver" | ||
| ) | ||
|
|
||
| var DefaultProxyConfig = Config{ | ||
| BodySize: "1m", | ||
| ConnectTimeout: 5, | ||
| SendTimeout: 60, | ||
| ReadTimeout: 60, | ||
| BufferSize: "4k", | ||
| } | ||
|
|
||
| // Config returns the proxy timeout to use in the upstream server/s | ||
| type Config struct { | ||
| BodySize string `json:"bodySize"` | ||
| ConnectTimeout int `json:"connectTimeout"` | ||
| SendTimeout int `json:"sendTimeout"` | ||
| ReadTimeout int `json:"readTimeout"` | ||
| BufferSize string `json:"bufferSize"` | ||
| } | ||
|
|
||
| // Equal tests for equality between two Configuration types | ||
| func (l1 *Config) Equal(l2 *Config) bool { | ||
| if l1 == l2 { | ||
| return true | ||
| } | ||
| if l1 == nil || l2 == nil { | ||
| return false | ||
| } | ||
| if l1.BodySize != l2.BodySize { | ||
| return false | ||
| } | ||
| if l1.ConnectTimeout != l2.ConnectTimeout { | ||
| return false | ||
| } | ||
| if l1.SendTimeout != l2.SendTimeout { | ||
| return false | ||
| } | ||
| if l1.ReadTimeout != l2.ReadTimeout { | ||
| return false | ||
| } | ||
| if l1.BufferSize != l2.BufferSize { | ||
| return false | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| type proxy struct { | ||
| r resolver.Resolver | ||
| } | ||
|
|
||
| // NewParser creates a new reverse proxy configuration annotation parser | ||
| func NewParser(r resolver.Resolver) parser.IngressAnnotation { | ||
| return proxy{r} | ||
| } | ||
|
|
||
| // ParseAnnotations parses the annotations contained in the ingress | ||
| // rule used to configure upstream check parameters | ||
| func (a proxy) Parse(ing *extensions.Ingress) (interface{}, error) { | ||
| ct, err := parser.GetIntAnnotation("proxy-connect-timeout", ing) | ||
| if err != nil { | ||
| ct = DefaultProxyConfig.ConnectTimeout | ||
| } | ||
|
|
||
| st, err := parser.GetIntAnnotation("proxy-send-timeout", ing) | ||
| if err != nil { | ||
| st = DefaultProxyConfig.SendTimeout | ||
| } | ||
|
|
||
| rt, err := parser.GetIntAnnotation("proxy-read-timeout", ing) | ||
| if err != nil { | ||
| rt = DefaultProxyConfig.ReadTimeout | ||
| } | ||
|
|
||
| bufs, err := parser.GetStringAnnotation("proxy-buffer-size", ing) | ||
| if err != nil || bufs == "" { | ||
| bufs = DefaultProxyConfig.BufferSize | ||
| } | ||
|
|
||
| bs, err := parser.GetStringAnnotation("proxy-body-size", ing) | ||
| if err != nil || bs == "" { | ||
| bs = DefaultProxyConfig.BodySize | ||
| } | ||
|
|
||
| return &Config{bs, ct, st, rt, bufs}, nil | ||
| } |
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,139 @@ | ||
| /* | ||
| Copyright 2016 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 proxy | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| api "k8s.io/api/core/v1" | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
| meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
|
|
||
| "github.ibm.com/IBMPrivateCloud/icp-management-ingress/pkg/ingress/annotations/parser" | ||
| "github.ibm.com/IBMPrivateCloud/icp-management-ingress/pkg/ingress/resolver" | ||
| ) | ||
|
|
||
| func buildIngress() *extensions.Ingress { | ||
| defaultBackend := extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| } | ||
|
|
||
| return &extensions.Ingress{ | ||
| ObjectMeta: meta_v1.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: api.NamespaceDefault, | ||
| }, | ||
| Spec: extensions.IngressSpec{ | ||
| Backend: &extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| Rules: []extensions.IngressRule{ | ||
| { | ||
| Host: "foo.bar.com", | ||
| IngressRuleValue: extensions.IngressRuleValue{ | ||
| HTTP: &extensions.HTTPIngressRuleValue{ | ||
| Paths: []extensions.HTTPIngressPath{ | ||
| { | ||
| Path: "/foo", | ||
| Backend: defaultBackend, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| type mockBackend struct { | ||
| resolver.Mock | ||
| } | ||
|
|
||
| func TestProxy(t *testing.T) { | ||
| ing := buildIngress() | ||
|
|
||
| data := map[string]string{} | ||
| data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = "1" | ||
| data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = "2" | ||
| data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = "3" | ||
| data[parser.GetAnnotationWithPrefix("proxy-buffer-size")] = "1k" | ||
| data[parser.GetAnnotationWithPrefix("proxy-body-size")] = "2k" | ||
| ing.SetAnnotations(data) | ||
|
|
||
| i, err := NewParser(&resolver.Mock{}).Parse(ing) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error parsing a valid") | ||
| } | ||
|
|
||
| p, ok := i.(*Config) | ||
| if !ok { | ||
| t.Fatalf("expected a Config type") | ||
| } | ||
| if !ok { | ||
| t.Fatalf("expected a Config type") | ||
| } | ||
| if p.ConnectTimeout != 1 { | ||
| t.Errorf("expected 1 as connect-timeout but returned %v", p.ConnectTimeout) | ||
| } | ||
| if p.SendTimeout != 2 { | ||
| t.Errorf("expected 2 as send-timeout but returned %v", p.SendTimeout) | ||
| } | ||
| if p.ReadTimeout != 3 { | ||
| t.Errorf("expected 3 as read-timeout but returned %v", p.ReadTimeout) | ||
| } | ||
| if p.BufferSize != "1k" { | ||
| t.Errorf("expected 1k as buffer-size but returned %v", p.BufferSize) | ||
| } | ||
| if p.BodySize != "2k" { | ||
| t.Errorf("expected 2k as body-size but returned %v", p.BodySize) | ||
| } | ||
| } | ||
|
|
||
| func TestProxyWithNoAnnotation(t *testing.T) { | ||
| ing := buildIngress() | ||
|
|
||
| data := map[string]string{} | ||
| ing.SetAnnotations(data) | ||
|
|
||
| i, err := NewParser(&resolver.Mock{}).Parse(ing) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error parsing a valid") | ||
| } | ||
| p, ok := i.(*Config) | ||
| if !ok { | ||
| t.Fatalf("expected a Config type") | ||
| } | ||
| if p.ConnectTimeout != 5 { | ||
| t.Errorf("expected 5 as connect-timeout but returned %v", p.ConnectTimeout) | ||
| } | ||
| if p.SendTimeout != 60 { | ||
| t.Errorf("expected 60 as send-timeout but returned %v", p.SendTimeout) | ||
| } | ||
| if p.ReadTimeout != 60 { | ||
| t.Errorf("expected 60 as read-timeout but returned %v", p.ReadTimeout) | ||
| } | ||
| if p.BufferSize != "4k" { | ||
| t.Errorf("expected 4k as buffer-size but returned %v", p.BufferSize) | ||
| } | ||
| if p.BodySize != "1m" { | ||
| t.Errorf("expected 1m as body-size but returned %v", p.BodySize) | ||
| } | ||
| } |
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
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
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
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