ingress: Add force-https annotation support #30616
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
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
youngnick
added
the
release-note/minor
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
youngnick
force-pushed
the
force-https-annotation
branch
from
d23f7b3 to
9499019
Compare
|
/test |
sayboras
changed the title
sayboras
added
area/servicemesh
lambdanis
approved these changes
Feb 5, 2024
youngnick
force-pushed
the
force-https-annotation
branch
3 times, most recently
from
221e34b to
c968dba
Compare
|
/test |
youngnick
force-pushed
the
force-https-annotation
branch
from
c968dba to
3ea4f63
Compare
|
/test |
youngnick
force-pushed
the
force-https-annotation
branch
from
3ea4f63 to
055edd6
Compare
|
/test |
mhofstetter
reviewed
Feb 13, 2024
youngnick
force-pushed
the
force-https-annotation
branch
2 times, most recently
from
7c00575 to
a8eb9f2
Compare
|
/test |
youngnick
force-pushed
the
force-https-annotation
branch
from
a8eb9f2 to
2276144
Compare
|
/test |
1 similar comment
|
/test |
maintainer-s-little-helper
bot
added
the
ready-to-merge
mhofstetter
removed
the
ready-to-merge
youngnick
force-pushed
the
force-https-annotation
branch
from
2276144 to
704f872
Compare
|
/test |
mhofstetter
requested changes
Feb 14, 2024
youngnick
force-pushed
the
force-https-annotation
branch
2 times, most recently
from
240386e to
31756af
Compare
This change adds support for the new `ingress.cilium.io/force-https` annotation. This annotation changes generated model.Listeners such that, if a TLS Listener is present, any config for that secure listener is copied to an insecure listener, with redirects to the secure listener for routing instead of direct routing. The annotation itself can be set to `enabled`, `disabled`, or any truthy or false-y value (as understood by Go's `strconv.ParseBool()` function). The annotation _overrides_ the exsiting "enforce-https" config, which does the same thing. That is, if both `ingress.cilium.io/force-https` and `enforce-https` are set, the annotation's value will override the value of `enforce-https`. When the annotation is unset, `enforce-https` produces similar functionality. Tests for all cases have been added. Implementation details: - `model.Listener` now has a `ForceHTTPtoHTTPSRedirect` field that controls if the redirect behavior will be used. - The value of `enforceHTTPS` is no longer passed into Translators. Ingress ingestion now handles folding the possible values of `enforceHTTPS` into the `model.Listener`, so the Translators now don't need to know. Signed-off-by: Nick Young <[email protected]>
youngnick
force-pushed
the
force-https-annotation
branch
from
31756af to
2dbe133
Compare
|
/test |
maintainer-s-little-helper
bot
added
the
ready-to-merge
mhofstetter
added a commit
to mhofstetter/cilium
that referenced
this pull request
Feb 16, 2024
Currently, the config property `enforce-ingress-https` doesn't have any effect as its value isn't propagated to the ingresscontroller reconciler. Hence, Ingress HTTPS is never enforced globally (only via annotation). This commit fixes this by passing the config value to the reconciler. Fixes: cilium#30616 Signed-off-by: Marco Hofstetter <[email protected]>
mhofstetter
reviewed
Feb 16, 2024
| @@ -38,6 +38,7 @@ type ingressReconciler struct { | |||
| defaultLoadbalancerMode string | |||
| defaultSecretNamespace string | |||
| defaultSecretName string | |||
| enforcedHTTPS bool | |||
There was a problem hiding this comment.
@youngnick looks enforcedHTTPS isn't handled in newIngressReconciler - hence it's always false. We should pass the corresponding config value from the cell.
I opened #30804
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 16, 2024
Currently, the config property `enforce-ingress-https` doesn't have any effect as its value isn't propagated to the ingresscontroller reconciler. Hence, Ingress HTTPS is never enforced globally (only via annotation). This commit fixes this by passing the config value to the reconciler. Fixes: #30616 Signed-off-by: Marco Hofstetter <[email protected]>
aanm
pushed a commit
to aanm/cilium
that referenced
this pull request
Feb 19, 2024
Currently, the config property `enforce-ingress-https` doesn't have any effect as its value isn't propagated to the ingresscontroller reconciler. Hence, Ingress HTTPS is never enforced globally (only via annotation). This commit fixes this by passing the config value to the reconciler. Fixes: cilium#30616 Signed-off-by: Marco Hofstetter <[email protected]>
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.
This change adds support for the new
ingress.cilium.io/force-httpsannotation. This annotation changes generated model.Listeners such that, if a TLS Listener is present, any config for that secure listener is copied to an insecure listener, with redirects to the secure listener for routing instead of direct routing.The annotation itself can be set to
enabled,disabled, or any truthy or false-y value (as understood by Go'sstrconv.ParseBool()function).The annotation overrides the exsiting "enforce-https" config, which does the same thing.
That is, if both
ingress.cilium.io/force-httpsandenforce-httpsare set, the annotation's value will override the value ofenforce-https.When the annotation is unset,
enforce-httpsproduces similar functionality.Tests for all cases have been added.
Implementation details:
model.Listenernow has aForceHTTPtoHTTPSRedirectfield that controls if the redirect behavior will be used.enforceHTTPSis no longer passed into Translators. Ingress ingestion now handles folding the possible values ofenforceHTTPSinto themodel.Listener, so the Translators now don't need to know.Updates: #22887