-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create custom annotation for satisfy "value"
- Loading branch information
1 parent
784d57e
commit ec04852
Showing
9 changed files
with
249 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| Copyright 2019 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 satisfy | ||
|
|
||
| import ( | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
|
|
||
| "k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
| "k8s.io/ingress-nginx/internal/ingress/resolver" | ||
| ) | ||
|
|
||
| type satisfy struct { | ||
| r resolver.Resolver | ||
| } | ||
|
|
||
| // NewParser creates a new SATISFY annotation parser | ||
| func NewParser(r resolver.Resolver) parser.IngressAnnotation { | ||
| return satisfy{r} | ||
| } | ||
|
|
||
| // Parse parses annotation contained in the ingress | ||
| func (s satisfy) Parse(ing *extensions.Ingress) (interface{}, error) { | ||
| satisfy, err := parser.GetStringAnnotation("satisfy", ing) | ||
| if err != nil || satisfy != "any" { | ||
| satisfy = "all" | ||
| } | ||
|
|
||
| return satisfy, 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,95 @@ | ||
| /* | ||
| Copyright 2019 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 satisfy | ||
|
|
||
| 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" | ||
| "k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
| "k8s.io/ingress-nginx/internal/ingress/resolver" | ||
| ) | ||
|
|
||
| func buildIngress() *extensions.Ingress { | ||
| defaultBackend := extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| } | ||
|
|
||
| return &extensions.Ingress{ | ||
| ObjectMeta: meta_v1.ObjectMeta{ | ||
| Name: "fake", | ||
| Namespace: api.NamespaceDefault, | ||
| }, | ||
| Spec: extensions.IngressSpec{ | ||
| Backend: &extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| Rules: []extensions.IngressRule{ | ||
| { | ||
| Host: "fake.host.com", | ||
| IngressRuleValue: extensions.IngressRuleValue{ | ||
| HTTP: &extensions.HTTPIngressRuleValue{ | ||
| Paths: []extensions.HTTPIngressPath{ | ||
| { | ||
| Path: "/fake", | ||
| Backend: defaultBackend, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func TestSatisfyParser(t *testing.T) { | ||
| ing := buildIngress() | ||
|
|
||
| data := map[string]string{ | ||
| "any": "any", | ||
| "all": "all", | ||
| "invalid": "all", | ||
| } | ||
|
|
||
| annotations := map[string]string{} | ||
|
|
||
| for input, expected := range data { | ||
| annotations[parser.GetAnnotationWithPrefix("satisfy")] = input | ||
| ing.SetAnnotations(annotations) | ||
|
|
||
| satisfyt, err := NewParser(&resolver.Mock{}).Parse(ing) | ||
| if err != nil { | ||
| t.Errorf("error parsing annotations: %v", err) | ||
| } | ||
|
|
||
| val, ok := satisfyt.(string) | ||
| if !ok { | ||
| t.Errorf("expected a string type but return %t", satisfyt) | ||
| } | ||
|
|
||
| if val != expected { | ||
| t.Errorf("expected %v but returned %v", expected, val) | ||
| } | ||
| } | ||
| } |
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
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,87 @@ | ||
| /* | ||
| Copyright 2019 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 ( | ||
| "fmt" | ||
| "net/http" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/parnurzeal/gorequest" | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
| "k8s.io/ingress-nginx/test/e2e/framework" | ||
| ) | ||
|
|
||
| var _ = framework.IngressNginxDescribe("Annotations - SATISFY", func() { | ||
| f := framework.NewDefaultFramework("satisfy") | ||
|
|
||
| BeforeEach(func() { | ||
| f.NewEchoDeployment() | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| }) | ||
|
|
||
| It("should configure satisfy directive correctly", func() { | ||
| host := "satisfy" | ||
| annotationKey := "nginx.ingress.kubernetes.io/satisfy" | ||
|
|
||
| annotations := map[string]string{ | ||
| "any": "any", | ||
| "all": "all", | ||
| "invalid": "all", | ||
| } | ||
|
|
||
| results := map[string]string{ | ||
| "any": "satisfy any", | ||
| "all": "satisfy all", | ||
| "invalid": "satisfy all", | ||
| } | ||
|
|
||
| initAnnotations := map[string]string{ | ||
| annotationKey: "all", | ||
| } | ||
|
|
||
| ing := framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, &initAnnotations) | ||
| f.EnsureIngress(ing) | ||
|
|
||
| for key, result := range results { | ||
| err := framework.UpdateIngress(f.KubeClientSet, f.IngressController.Namespace, host, func(ingress *extensions.Ingress) error { | ||
| ingress.ObjectMeta.Annotations[annotationKey] = annotations[key] | ||
| return nil | ||
| }) | ||
| Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| f.WaitForNginxServer(host, | ||
| func(server string) bool { | ||
| return Expect(server).Should(ContainSubstring(result)) | ||
| }) | ||
|
|
||
| resp, body, errs := gorequest.New(). | ||
| Get(f.IngressController.HTTPURL). | ||
| Retry(10, 1*time.Second, http.StatusNotFound). | ||
| Set("Host", host). | ||
| End() | ||
|
|
||
| Expect(errs).Should(BeEmpty()) | ||
| Expect(resp.StatusCode).Should(Equal(http.StatusOK)) | ||
| Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host))) | ||
| } | ||
| }) | ||
| }) |