Skip to content

Feature/ssl redirect#290

Merged
k8s-ci-robot merged 9 commits intokubernetes-sigs:mainfrom
Stevenjin8:feature/ssl-redirect
Jan 22, 2026
Merged

Feature/ssl redirect#290
k8s-ci-robot merged 9 commits intokubernetes-sigs:mainfrom
Stevenjin8:feature/ssl-redirect

Conversation

@Stevenjin8
Copy link
Copy Markdown
Contributor

@Stevenjin8 Stevenjin8 commented Jan 5, 2026 •
edited
Loading

depends on #288 . This PR is pretty important as nginx.ingress.kubernetes.io/force-ssl-redirect is true by default

/kind feature
What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Does this PR introduce a user-facing change?:

Add support for `nginx.ingress.kubernetes.io/ssl-redirect`

@k8s-ci-robot k8s-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label Jan 5, 2026
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 5, 2026
robscott
robscott approved these changes Jan 13, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@robscott robscott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Stevenjin8!

Comment thread pkg/i2gw/providers/ingressnginx/converter.go
// Convert plain ingress resources to gateway resources, ignoring all
// provider-specific features.
ir, errs := common.ToIR(ingressList, storage.ServicePorts, i2gw.ProviderImplementationSpecificOptions{})
pIR, errs := common.ToIR(ingressList, storage.ServicePorts, i2gw.ProviderImplementationSpecificOptions{})
Copy link
Copy Markdown
Member

@robscott robscott Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the significance of this rename?

Copy link
Copy Markdown
Contributor Author

@Stevenjin8 Stevenjin8 Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its more for consistency. Its not everywhere (just to minimize diff form refactor), but we use pIR here and there. Its to differentiate between provider and emitter IR.

ingress2gateway/pkg/i2gw/provider_intermediate/conversion.go

Line 24 in 2c81a62

func ToEmitterIR(pIR ProviderIR) emitterir.EmitterIR {

Comment thread pkg/i2gw/providers/ingressnginx/redirect.go Outdated
Comment thread pkg/i2gw/providers/ingressnginx/redirect.go Outdated
Comment thread pkg/i2gw/providers/ingressnginx/redirect.go Outdated
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2026
@Stevenjin8 Stevenjin8 self-assigned this Jan 13, 2026
@Stevenjin8 Stevenjin8 force-pushed the feature/ssl-redirect branch from 8306db6 to e68b1a5 Compare January 13, 2026 19:47
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2026
eladmotola
eladmotola reviewed Jan 20, 2026
View reviewed changes
Comment thread pkg/i2gw/providers/ingressnginx/annotations.go
UseRegexAnnotation = "nginx.ingress.kubernetes.io/use-regex"

// SSL Redirect annotation
SSLRedirectAnnotation = "nginx.ingress.kubernetes.io/ssl-redirect"
Copy link
Copy Markdown
Contributor

@eladmotola eladmotola Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the description you wrote that you add support for force-ssl-redirect but i can see different annotation

Copy link
Copy Markdown
Contributor Author

@Stevenjin8 Stevenjin8 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

@Stevenjin8 Stevenjin8 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026
@Stevenjin8
Copy link
Copy Markdown
Contributor Author

Stevenjin8 commented Jan 21, 2026

holding as we might need to wait for a gwapi release.

@Stevenjin8 Stevenjin8 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026
@Stevenjin8
Copy link
Copy Markdown
Contributor Author

Stevenjin8 commented Jan 21, 2026

ah its probably fine. Its coming out on the next release.

@k8s-ci-robot k8s-ci-robot removed the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 22, 2026
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 22, 2026
@Stevenjin8
Copy link
Copy Markdown
Contributor Author

Stevenjin8 commented Jan 22, 2026

we need to redirect with code 308. In 1.4 HTTPRedirectFilter only supports 301, 302. 1.5 (Dev right now) adds support for 303, 307 and 308

@LiorLieberman
Copy link
Copy Markdown
Member

LiorLieberman commented Jan 22, 2026

/lgtm
/approve

Thank you!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 22, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LiorLieberman, robscott, Stevenjin8

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [LiorLieberman,Stevenjin8,robscott]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 44c0b14 into kubernetes-sigs:main Jan 22, 2026
5 checks passed
@asklokesh asklokesh mentioned this pull request Jan 27, 2026
Closed
5 tasks
@Stevenjin8 Stevenjin8 mentioned this pull request Feb 11, 2026
Closed
rajashish pushed a commit to rajashish/ingress2gateway1 that referenced this pull request Feb 21, 2026
@Stevenjin8
Feature/ssl redirect (kubernetes-sigs#290)
c12f57e 
* non-regex rewrites

* handle regex paths

* non-nil map

* ssl redirect

* some fixes

* fix tests

* lint

* Better bool parsing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@robscott robscott robscott approved these changes

@LiorLieberman LiorLieberman Awaiting requested review from LiorLieberman LiorLieberman is a code owner

@rikatz rikatz Awaiting requested review from rikatz

+1 more reviewer

@eladmotola eladmotola eladmotola left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Stevenjin8 Stevenjin8

@LiorLieberman LiorLieberman

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Stevenjin8 @LiorLieberman @k8s-ci-robot @robscott @eladmotola