ignore ingresses without specified class #527
Merged
Conversation
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
jcmoraisjr
reviewed
Mar 15, 2020
| @@ -36,6 +36,7 @@ The following command-line options are supported: | |||
| | [`--verify-hostname`](#verify-hostname) | [true\|false] | `true` | | | |||
| | [`--wait-before-shutdown`](#wait-before-shutdown) | seconds as integer | `0` | v0.8 | | |||
| | [`--watch-namespace`](#watch-namespace) | namespace | all namespaces | | | |||
| | [`--ignore-ingress-without-class`](#ignore-ingress-without-class)| [true\|false] | `false` | | | |||
There was a problem hiding this comment.
Use alphabetical order. Add also v0.10 in the Since column.
There was a problem hiding this comment.
made the changes, please verify
|
|
||
| ## --ignore-ingress-without-class | ||
|
|
||
| Defines if the ingress without the ingress.class annotation will be considered or not. If `--ignore-ingress-without-class=true` then only the ingresses with the matching ingress.class annotation will be considered, ingresses with missing or different ingress.class annotation will not be considered. Default is false. |
There was a problem hiding this comment.
Use alphabetical order as well.
There was a problem hiding this comment.
made the changes, please verify
| @@ -136,7 +137,8 @@ const IngressClassKey = "kubernetes.io/ingress.class" | |||
| // IsValidClass ... | |||
| func (ic *GenericController) IsValidClass(ing *extensions.Ingress) bool { | |||
| ann, found := ing.Annotations[IngressClassKey] | |||
| return !found || ann == ic.cfg.IngressClass | |||
|
|
|||
| return (ic.cfg.IgnoreIngressWithoutClass && found && ann == ic.cfg.IngressClass) || (!ic.cfg.IgnoreIngressWithoutClass && (!found || ann == ic.cfg.IngressClass)) | |||
There was a problem hiding this comment.
Change to a simpler approach, eg (didn't test)
if !found {
return !ic.cfg.IgnoreIngressWithoutClass
}
return ann == ic.cfg.IngressClassThere was a problem hiding this comment.
made the changes, please verify
…simplified the if else logic
|
lgtm, thanks! Merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Provide the flag to ignore ingresses without a specified class.
Fixes #522