merge with upstream by puertomontt · Pull Request #104 · kgateway-dev/ingress2gateway

puertomontt · 2026-03-28T04:57:04Z

merge with upstream

Notes:

pkg/i2gw/providers/ingressnginx/proxy_connect_timeout.go, pkg/i2gw/providers/ingressnginx/proxy_read_timeout.go, pkg/i2gw/providers/ingressnginx/proxy_send_timeout.go deleted. Replaced by upstream timeouts.go
We had incorrect assumption in our timeouts. ingress-nginx timeouts are TCP level, not HTTP level.
pkg/i2gw/providers/ingressnginx/proxybodysize.go, pkg/i2gw/providers/ingressnginx/bodybuffer.go deleted and replaced with pkg/i2gw/providers/ingressnginx/bodysize.go
fix a bug (upstream) in regex logic 1d435c0

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Does this PR introduce a user-facing change?:

* emitters * touch up * Grammar and some more responsibilities for Emitters. * Update docs/emitters.md Co-authored-by: Lior Lieberman <liorlib7+riskified@gmail.com> * more specific scope * out of scope * Apply suggestions from code review Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com> Co-authored-by: Nick Young <inocuo@gmail.com> * common layer --------- Co-authored-by: Lior Lieberman <liorlib7+riskified@gmail.com> Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com> Co-authored-by: Nick Young <inocuo@gmail.com>

* WIP * initial emitter impl Signed-off-by: Steven Jin Xuan <sjinxuan@microsoft.com> * Fix tests * remove bad docs (add them later) * comments * remove empty file * naming and emitter cli arg * update comments * remove unused nginx stff * use correct interface. * add common emitter * move gce to a dedicated emitter * remove unused code * gce unit tests * lint * copyright dates * lint * Comments on emitters * Fix linting * rename to gceServiceIR * Revert copyright dates for moved files * rename to standard * fix comments * add underscore to package names * commetns for common emitter usage * change common to utils for (better name)) * lint --------- Signed-off-by: Steven Jin Xuan <sjinxuan@microsoft.com>

…s-sigs#293) Reference kubernetes/community#8736

We have a read operation on a shared map without using a mutex in CreateNotificationTables. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

* implement header manipulation for nginxingress * pr comments * fmt * fmt * fmt * fmt * add TODOs * fix mege from master * fmt * Update pkg/i2gw/providers/ingressnginx/headers.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * continue instead of panic * Update pkg/i2gw/providers/ingressnginx/headers_test.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * Update pkg/i2gw/providers/ingressnginx/annotations.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * Update pkg/i2gw/providers/ingressnginx/headers.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * Update pkg/i2gw/providers/ingressnginx/utils.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> --------- Co-authored-by: Steven Jin <stevenjin8@gmail.com>

* Update changelog for 0.5.0 * update references to 0.5.0

* non-regex rewrites * handle regex paths * non-nil map * fix tests * lint * lint and test

* non-regex rewrites * handle regex paths * non-nil map * ssl redirect * some fixes * fix tests * lint * Better bool parsing

…tes-sigs#302) Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

* feat: support route rule name Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: test output Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> --------- Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

* Add some reviewers * Remove Kota

* migrate golangci-lint v2 Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: gosec lint Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: govet lint Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: testifylint Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: staticcheck Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * update go version in workflow Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * revert timeout Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> --------- Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

* Add k8s clients Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add logger interface Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add CRD helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add Helm helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add namespace helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add dummy app helpers We need a dummy workload so that ingresses and gateways have some service to send test traffic to. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helper for installing Istio Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helpers for Kong Kong is both an ingress controller and a GWAPI implementation. Add helpers for both. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add GWAPI helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add port forwarding helpers We use port forwarding to reach ingress controllers and gateways in an infrastructure-agnostic way during testing. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add ingress-nginx helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helper for creating ingresses Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add resource manager To be able to run multiple test cases concurrently on the same cluster, some resources must be shared. For example, CRDs are cluster-level rather than namespace-scoped. In addition, deploying multiple instances of an ingress controller or GWAPI implementation wastes time and resources even in cases where it's technically possible to do so. To address these concerns, we add a resource manager. This construct allows efficient and thread-safe sharing of resources. A shared resource is created on first usage, returned on subsequent attempts to acquire the resources and cleaned up when no users remain. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add verifier interface and httpGetVerifier implementation Verifiers are used to ensure ingress and GWAPI resources process traffic according to expectations. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add main test logic Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add some initial test cases Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add Make targets for e2e Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add README for e2e tests Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Install kind to ./bin We can't use sudo on CI. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Use builder pattern for ingresses in test cases This allows for more compact test case definitions and fewer indentation levels. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Centralize retry logic Rather than implementing bespoke retry logic across the code base, implement generic retry helpers and reuse them. This also extracts the retry logic out of verifiers for a better separation of concerns. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Use ingress2gateway binary Call the binary instead of running Go code directly. This simulates actual customer usage better and works around concurrency issues caused by multiple test cases executing in parallel. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> --------- Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

* feat: support route rule name Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * feat: body size parse in ingress nginx provider Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * feat: body size emission in envoy gateway provider Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * add notifications Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * update byte regex Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * add CODEOWNERS Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * address comments in provider Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * address comments in emitter Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: setting nil in IR Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix boilerplate lint Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> --------- Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

* feat: Implement PR1 Infrastructure and Standard CORS support * refactor(gce): rename upsell to update and fix duplicate * Address review comments: delete gce_converter, add --allow-alpha-gw-api flag * fix(gce): unconditionally set GatewayClassName to gke-l7-global-external-managed * fix(ingressnginx): improve cors-max-age parsing validation * feat: make GCE GatewayClassName configurable via flag * Update pkg/i2gw/emitter_intermediate/intermediate_representation.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * Fix build error by removing usage of removed Gce field * feat(gce): implement conditional logic for --gce-gateway-class-name * refactor: Move CORS filtering from common emitter to standard emitter * chore: revert GCE and GatewayClassName changes to focus on CORS * Cleanup: remove implicit emitter flag association * Address PR comments: Refactor CORS to CommonEmitter and cleanup * Revert standard.go to match main branch * Revert conversion.go to match main branch * Fix gosec lint errors from cors changes --------- Co-authored-by: Steven Jin <stevenjin8@gmail.com>

* feat: Add support for use-regex annotation * Address review comments * style: fix gofmt in regex_test.go

* implement header manipulation for nginxingress * pr comments * fmt * fmt * fmt * fmt * add TODOs * fix mege from master * fmt * Update pkg/i2gw/providers/ingressnginx/headers.go Co-authored-by: Steven Jin <stevenjin8@gmail.com> * timeouts * timeouts * add warning for timeouts * lint * Lint * refactor timeout IR * update tests * lint --------- Co-authored-by: eladmotola <eladmotola95@gmail.com> Co-authored-by: eladmotola <43670376+eladmotola@users.noreply.github.com>

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

* added canary by header * fixed providerir import * added warning message for unsupported canary annotations * update test_parseCanaryConfig for canary by header * fix default to zero test * lint * added tests for parsing headers from canary config * set weights when no isWeight or isHeader * remove weight from header backened * moved to seperate annotations folder * fixed ruleBackendSources to update for canary by header * add never header match for canary-by-header with no custom value * add canary and non-canary backend sources to always rule * fixed errors in canary file

…#330) * Add k8s clients Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add logger interface Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add CRD helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add Helm helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add namespace helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add dummy app helpers We need a dummy workload so that ingresses and gateways have some service to send test traffic to. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helper for installing Istio Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helpers for Kong Kong is both an ingress controller and a GWAPI implementation. Add helpers for both. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add GWAPI helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add port forwarding helpers We use port forwarding to reach ingress controllers and gateways in an infrastructure-agnostic way during testing. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add ingress-nginx helpers Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add helper for creating ingresses Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add resource manager To be able to run multiple test cases concurrently on the same cluster, some resources must be shared. For example, CRDs are cluster-level rather than namespace-scoped. In addition, deploying multiple instances of an ingress controller or GWAPI implementation wastes time and resources even in cases where it's technically possible to do so. To address these concerns, we add a resource manager. This construct allows efficient and thread-safe sharing of resources. A shared resource is created on first usage, returned on subsequent attempts to acquire the resources and cleaned up when no users remain. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add verifier interface and httpGetVerifier implementation Verifiers are used to ensure ingress and GWAPI resources process traffic according to expectations. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add main test logic Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add some initial test cases Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add Make targets for e2e Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Add README for e2e tests Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Install kind to ./bin We can't use sudo on CI. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Use builder pattern for ingresses in test cases This allows for more compact test case definitions and fewer indentation levels. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Centralize retry logic Rather than implementing bespoke retry logic across the code base, implement generic retry helpers and reuse them. This also extracts the retry logic out of verifiers for a better separation of concerns. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Use ingress2gateway binary Call the binary instead of running Go code directly. This simulates actual customer usage better and works around concurrency issues caused by multiple test cases executing in parallel. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Canary tests * Path rewrite * Verify TLS Ingresses and TLS redirects * touchup * touchup * lint * lint * use regex body verifier * random canary host * CORS tests * move to module * Use monthly CRD and move packages * Review * lints * review * lint * remove unecessary host * comments --------- Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> Co-authored-by: Johanan Liebermann <jliebermann@microsoft.com>

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

* Include ingress name in verifier logs It's hard to know which ingress is being verified in test cases with multiple ingresses. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> * Resolve hosts outside verifiers This makes the verifier logs more informative and less confusing. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com> --------- Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

* kgateway emitter Signed-off-by: omar <omar.hammami@solo.io> * remove test and fix year Signed-off-by: omar <omar.hammami@solo.io> * add puertomontt as owner Signed-off-by: omar <omar.hammami@solo.io> * remove from owners Signed-off-by: omar <omar.hammami@solo.io> * e2e test Signed-off-by: omar <omar.hammami@solo.io> * address feedback Signed-off-by: omar <omar.hammami@solo.io> * add emitter to testCase Signed-off-by: omar <omar.hammami@solo.io> * update test Signed-off-by: omar <omar.hammami@solo.io> * remove periods Signed-off-by: omar <omar.hammami@solo.io> * remove unused code Signed-off-by: omar <omar.hammami@solo.io> * go mod changes Signed-off-by: omar <omar.hammami@solo.io> --------- Signed-off-by: omar <omar.hammami@solo.io>

* feat: ip source range in ingress nginx provider Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * feat: ip source range in envoy gateway emitter Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * tweak: buffer ir handling Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: security policy spec Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * update: simplify auth logic Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> --------- Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

The current code results in things like 'foo.example.comxxxxx'. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

small updates to test files: backend protocol, load balance, ssl redirect, basic Signed-off-by: omar <omar.hammami@solo.io>

update session affinity / regex test files Signed-off-by: omar <omar.hammami@solo.io>

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt · 2026-03-30T00:28:09Z

TODO: figure out timeouts
review regex / rewrite changes

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt · 2026-03-30T21:41:14Z

TODO: move to upstream e2e

puertomontt · 2026-03-31T04:54:40Z

TODO: check backend tls

danehans · 2026-03-31T15:21:33Z

TODO: move to upstream e2e

xref #106

Stevenjin8 and others added 30 commits December 8, 2025 13:07

Add Stevenjin8 to OWNERS. (kubernetes-sigs#277)

d8cd2d8

Update email announcement for new sig network mailing list (kubernete…

2175d63

…s-sigs#293) Reference kubernetes/community#8736

Fix data race in NotificationAggregator (kubernetes-sigs#292)

d5407c0

We have a read operation on a shared map without using a mutex in CreateNotificationTables. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

Fix typo (kubernetes-sigs#285)

788dce5

Release/prepare 0.5.0 (kubernetes-sigs#300)

2c81a62

* Update changelog for 0.5.0 * update references to 0.5.0

Feature/path rewrite (kubernetes-sigs#288)

1557d5b

* non-regex rewrites * handle regex paths * non-nil map * fix tests * lint * lint and test

Feature/ssl redirect (kubernetes-sigs#290)

44c0b14

* non-regex rewrites * handle regex paths * non-nil map * ssl redirect * some fixes * fix tests * lint * Better bool parsing

fix: setting proper secret group and kind in certificateRefs (kuberne…

8e88f2a

…tes-sigs#302) Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

feat: support route rule name (kubernetes-sigs#298)

ec8e395

* feat: support route rule name Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> * fix: test output Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com> --------- Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

Add some reviewers (kubernetes-sigs#321)

5f4e51f

* Add some reviewers * Remove Kota

Add Kota as owner (kubernetes-sigs#322)

10a1a2f

Add johanan as reviewer in OWNERS file (kubernetes-sigs#332)

7f3528b

feat: Add support for use-regex annotation (kubernetes-sigs#307)

b843bc0

* feat: Add support for use-regex annotation * Address review comments * style: fix gofmt in regex_test.go

Don't error on nil ingress.rules.http (kubernetes-sigs#335)

976ce6e

Fix inconsistent whitespace in switch (kubernetes-sigs#339)

32c0555

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

Bump Kong chart to v3.0.2 (kubernetes-sigs#349)

fd921d7

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

Fix hostname in test (kubernetes-sigs#352)

5deca64

The current code results in things like 'foo.example.comxxxxx'. Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>

puertomontt added 4 commits March 28, 2026 12:34

wire up basic/external auth

bbc01e0

small updates to test files: backend protocol, load balance, ssl redirect, basic Signed-off-by: omar <omar.hammami@solo.io>

restore support for ssl passthrough

6d1937a

update session affinity / regex test files Signed-off-by: omar <omar.hammami@solo.io>

restore service upstream

3eae893

Signed-off-by: omar <omar.hammami@solo.io>

fix up agentgateway

20c5aeb

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 29, 2026 02:30 — with GitHub Actions Inactive

add timeout test

c344743

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 29, 2026 19:34 — with GitHub Actions Inactive

fix link

071be0f

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 29, 2026 23:36 — with GitHub Actions Inactive

update e2e test files

d590cbd

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 29, 2026 23:45 — with GitHub Actions Inactive

bump gw api to 1.5.1 in e2e tests

593c31e

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 29, 2026 23:57 — with GitHub Actions Inactive

update ssl redirect to expect 308

49b9da0

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 30, 2026 18:14 — with GitHub Actions Inactive

fix regex rewrite logic

1d435c0

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 30, 2026 20:32 — with GitHub Actions Inactive

puertomontt force-pushed the sync branch from afec2da to 2cd7d07 Compare March 30, 2026 20:34

puertomontt temporarily deployed to release March 30, 2026 20:34 — with GitHub Actions Inactive

lint and remove unused code

2cd7d07

Signed-off-by: omar <omar.hammami@solo.io>

puertomontt temporarily deployed to release March 30, 2026 21:40 — with GitHub Actions Inactive

clean up

319c0e4

Signed-off-by: omar <omar.hammami@solo.io>

danehans mentioned this pull request Mar 31, 2026

Migrate e2e #106

Open

danehans approved these changes Mar 31, 2026

View reviewed changes

danehans merged commit 9220188 into main Mar 31, 2026
3 checks passed

danehans deleted the sync branch March 31, 2026 15:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge with upstream#104

merge with upstream#104
danehans merged 82 commits intomainfrom
sync

puertomontt commented Mar 28, 2026 •

edited

Loading

Uh oh!

puertomontt commented Mar 30, 2026

Uh oh!

puertomontt commented Mar 30, 2026

Uh oh!

puertomontt commented Mar 31, 2026

Uh oh!

danehans commented Mar 31, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Conversation

puertomontt commented Mar 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

puertomontt commented Mar 30, 2026

Uh oh!

puertomontt commented Mar 30, 2026

Uh oh!

puertomontt commented Mar 31, 2026

Uh oh!

danehans commented Mar 31, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

puertomontt commented Mar 28, 2026 •

edited

Loading