-
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 #418 from aledbf/fix-status-update
Only update Ingress status for the configured class
- Loading branch information
Showing
6 changed files
with
139 additions
and
106 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,55 @@ | ||
| /* | ||
| Copyright 2015 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 class | ||
|
|
||
| import ( | ||
| "github.com/golang/glog" | ||
| "k8s.io/kubernetes/pkg/apis/extensions" | ||
|
|
||
| "k8s.io/ingress/core/pkg/ingress/annotations/parser" | ||
| "k8s.io/ingress/core/pkg/ingress/errors" | ||
| ) | ||
|
|
||
| const ( | ||
| // IngressKey picks a specific "class" for the Ingress. | ||
| // The controller only processes Ingresses with this annotation either | ||
| // unset, or set to either the configured value or the empty string. | ||
| IngressKey = "kubernetes.io/ingress.class" | ||
| ) | ||
|
|
||
| // IsValid returns true if the given Ingress either doesn't specify | ||
| // the ingress.class annotation, or it's set to the configured in the | ||
| // ingress controller. | ||
| func IsValid(ing *extensions.Ingress, controller, defClass string) bool { | ||
| ingress, err := parser.GetStringAnnotation(IngressKey, ing) | ||
| if err != nil && !errors.IsMissingAnnotations(err) { | ||
| glog.Warningf("unexpected error reading ingress annotation: %v", err) | ||
| } | ||
|
|
||
| // we have 2 valid combinations | ||
| // 1 - ingress with default class | blank annotation on ingress | ||
| // 2 - ingress with specific class | same annotation on ingress | ||
| // | ||
| // and 2 invalid combinations | ||
| // 3 - ingress with default class | fixed annotation on ingress | ||
| // 4 - ingress with specific class | different annotation on ingress | ||
| if ingress == "" && controller == defClass { | ||
| return true | ||
| } | ||
|
|
||
| return ingress == controller | ||
| } |
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,58 @@ | ||
| /* | ||
| Copyright 2017 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 class | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/apis/extensions" | ||
| ) | ||
|
|
||
| func TestIsValidClass(t *testing.T) { | ||
| tests := []struct { | ||
| ingress string | ||
| controller string | ||
| defClass string | ||
| isValid bool | ||
| }{ | ||
| {"", "", "nginx", true}, | ||
| {"", "nginx", "nginx", true}, | ||
| {"nginx", "nginx", "nginx", true}, | ||
| {"custom", "custom", "nginx", true}, | ||
| {"", "killer", "nginx", false}, | ||
| {"", "", "nginx", true}, | ||
| {"custom", "nginx", "nginx", false}, | ||
| } | ||
|
|
||
| ing := &extensions.Ingress{ | ||
| ObjectMeta: api.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: api.NamespaceDefault, | ||
| }, | ||
| } | ||
|
|
||
| data := map[string]string{} | ||
| ing.SetAnnotations(data) | ||
| for _, test := range tests { | ||
| ing.Annotations[IngressKey] = test.ingress | ||
| b := IsValid(ing, test.controller, test.defClass) | ||
| if b != test.isValid { | ||
| t.Errorf("test %v - expected %v but %v was returned", test, test.isValid, b) | ||
| } | ||
| } | ||
| } |
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