Skip to content

Initial support for ListenerSet #55595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 7 commits into from
Jun 24, 2025
Merged

Initial support for ListenerSet #55595

merged 7 commits into from
Jun 24, 2025

Conversation

@howardjohn
Copy link
Member

@howardjohn howardjohn commented Mar 19, 2025 •
edited
Loading

Initial support for ListenerSet

@howardjohn howardjohn added the release-notes-none Indicates a PR that does not require release notes. label Mar 19, 2025
@istio-testing
Copy link
Collaborator

istio-testing commented Mar 19, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@istio-testing istio-testing added do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 19, 2025
@howardjohn howardjohn changed the title gw/listenerset Initial support for ListenerSet Mar 19, 2025
@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Mar 20, 2025
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 2, 2025
@howardjohn howardjohn force-pushed the gw/listenerset branch 2 times, most recently from 3738491 to 9e2f878 Compare April 2, 2025 23:14
@howardjohn howardjohn marked this pull request as ready for review April 16, 2025 19:07
@howardjohn howardjohn requested review from a team as code owners April 16, 2025 19:07
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Apr 16, 2025
@howardjohn howardjohn added the cherrypick/release-1.26 Set this label on a PR to auto-merge it to the release-1.26 branch label Apr 17, 2025
@istio-policy-bot istio-policy-bot added the lifecycle/stale Indicates a PR or issue hasn't been manipulated by an Istio team member for a while label Apr 19, 2025
@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 19, 2025
@howardjohn howardjohn requested a review from keithmattix April 21, 2025 15:07
@istio-testing istio-testing added needs-rebase Indicates a PR needs to be rebased before being merged and removed needs-rebase Indicates a PR needs to be rebased before being merged labels Apr 21, 2025
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 23, 2025
@howardjohn howardjohn requested a review from a team as a code owner April 23, 2025 17:26
@istio-policy-bot istio-policy-bot added the lifecycle/automatically-closed Indicates a PR or issue that has been closed automatically. label May 4, 2025
@keithmattix keithmattix reopened this May 4, 2025
@istio-policy-bot istio-policy-bot removed the lifecycle/stale Indicates a PR or issue hasn't been manipulated by an Istio team member for a while label May 4, 2025
@keithmattix keithmattix added lifecycle/staleproof Indicates a PR or issue has been deemed to be immune from becoming stale and/or automatically closed and removed lifecycle/automatically-closed Indicates a PR or issue that has been closed automatically. labels May 4, 2025
@howardjohn howardjohn mentioned this pull request May 9, 2025
Open
keithmattix
keithmattix reviewed Jun 3, 2025
View reviewed changes
@howardjohn
Copy link
Member Author

howardjohn commented Jun 4, 2025

rebased!

keithmattix
keithmattix reviewed Jun 5, 2025
View reviewed changes
pilot/pkg/config/kube/gateway/conversion.go
Message: msg,
}
}
setProgrammedCondition(gatewayConditions, internal, gatewayServices, warnings, allUsable)
Copy link
Contributor

@keithmattix keithmattix Jun 4, 2025

Choose a reason for hiding this comment

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

I like this function - consider comments or separate functions for each condition to improve readability

pilot/pkg/config/kube/gateway/gateway_collection.go Outdated
servers := []*istio.Server{}
for i, l := range ls.Listeners {
port, err := detectListenerPort(l)
_ = err // TODO
Copy link
Contributor

@keithmattix keithmattix Jun 5, 2025

Choose a reason for hiding this comment

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

?

Copy link
Member Author

@howardjohn howardjohn Jun 24, 2025

Choose a reason for hiding this comment

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

Fixed, but cannot be tested until kubernetes-sigs/gateway-api#3750 lands (it is impossible to get this error in 1.3 but will be possible in future

@PT-GD
Copy link

PT-GD commented Jun 16, 2025

Is the integ test failure a false positive/transient error?

Failed      baseline_test.go:3103: call failed from TestRunner to http://service-addressed-waypoint.echo-2-17287.svc.cluster.local:80 (using http): expected no error, but encountered 1/1 requests had errors; first error: Get "http://service-addressed-waypoint.echo-2-17287.svc.cluster.local:80": EOF} | {Failed      baseline_test.go:3103: call failed from TestRunner to http://service-addressed-waypoint.echo-2-17287.svc.cluster.local:80 (using http): expected no error, but encountered 1/1 requests had errors; first error: Get "http://service-addressed-waypoint.echo-2-17287.svc.cluster.local:80": EOF

@PT-GD
Copy link

PT-GD commented Jun 16, 2025

/test integ-ambient-mc

@howardjohn howardjohn force-pushed the gw/listenerset branch 2 times, most recently from da90e77 to d0b2d71 Compare June 16, 2025 15:15
@istio-testing istio-testing merged commit 1e5b9a0 into istio:master Jun 24, 2025
30 checks passed
@istio-testing
Copy link
Collaborator

istio-testing commented Jun 24, 2025

In response to a cherrypick label: #55595 failed to apply on top of branch "release-1.26":

Applying: Initial ListenerSet support
Using index info to reconstruct a base tree...
M	manifests/charts/istio-control/istio-discovery/templates/clusterrole.yaml
M	pilot/pkg/config/kube/crdclient/types.gen.go
M	pilot/pkg/config/kube/gateway/controller.go
M	pilot/pkg/config/kube/gateway/conversion.go
M	pilot/pkg/config/kube/gateway/conversion_test.go
M	pilot/pkg/config/kube/gateway/deploymentcontroller.go
M	pilot/pkg/config/kube/gateway/gateway_collection.go
M	pilot/pkg/config/kube/gateway/references_collection.go
M	pilot/pkg/model/push_context.go
M	pilot/pkg/serviceregistry/kube/conversion.go
M	pilot/pkg/xds/sds.go
M	pkg/config/constants/constants.go
M	pkg/config/schema/collections/collections.gen.go
M	pkg/config/schema/gvk/resources.gen.go
M	pkg/config/schema/gvr/resources.gen.go
M	pkg/config/schema/kubeclient/resources.gen.go
M	pkg/config/schema/kubetypes/resources.gen.go
M	pkg/config/schema/metadata.yaml
M	pkg/config/validation/validation.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/validation/validation.go
Auto-merging pkg/config/schema/metadata.yaml
Auto-merging pkg/config/schema/kubetypes/resources.gen.go
Auto-merging pkg/config/schema/kubeclient/resources.gen.go
Auto-merging pkg/config/schema/gvr/resources.gen.go
Auto-merging pkg/config/schema/gvk/resources.gen.go
Auto-merging pkg/config/schema/collections/collections.gen.go
Auto-merging pkg/config/constants/constants.go
Auto-merging pilot/pkg/xds/sds.go
Auto-merging pilot/pkg/serviceregistry/kube/conversion.go
Auto-merging pilot/pkg/model/push_context.go
Auto-merging pilot/pkg/config/kube/gateway/references_collection.go
Auto-merging pilot/pkg/config/kube/gateway/gateway_collection.go
CONFLICT (content): Merge conflict in pilot/pkg/config/kube/gateway/gateway_collection.go
Auto-merging pilot/pkg/config/kube/gateway/deploymentcontroller.go
CONFLICT (content): Merge conflict in pilot/pkg/config/kube/gateway/deploymentcontroller.go
Auto-merging pilot/pkg/config/kube/gateway/conversion_test.go
CONFLICT (content): Merge conflict in pilot/pkg/config/kube/gateway/conversion_test.go
Auto-merging pilot/pkg/config/kube/gateway/conversion.go
CONFLICT (content): Merge conflict in pilot/pkg/config/kube/gateway/conversion.go
Auto-merging pilot/pkg/config/kube/gateway/controller.go
Auto-merging pilot/pkg/config/kube/crdclient/types.gen.go
Auto-merging manifests/charts/istio-control/istio-discovery/templates/clusterrole.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Initial ListenerSet support

@istio-testing
Copy link
Collaborator

istio-testing commented Jun 24, 2025

In response to a cherrypick label: new issue created for failed cherrypick: #56762

@istio-testing istio-testing mentioned this pull request Jun 24, 2025
Closed
DerekTBrown pushed a commit to DerekTBrown/istio that referenced this pull request Jun 25, 2025
@howardjohn @DerekTBrown
Initial support for ListenerSet (istio#55595)
eb8379b 
* Initial ListenerSet support

* lint

* gen

* rebase

* Rebase

* rebase

* misc fixes
@mikemorris mikemorris mentioned this pull request Jul 2, 2025
Open
fjglira pushed a commit to fjglira/istio that referenced this pull request Sep 26, 2025
Automator: merge upstream changes to openshift-service-mesh/istio@master
a8a7406 
* upstream/master:
  Multicluster AmbientIndex (istio#56395)
  Add support for OPTIONAL_MUTUAL to Gateway API (istio#56742)
  Automator: update proxy@master in istio/istio@master (istio#56732)
  CNI Pod delete edge case (istio#56738)
  ensure consistency in inject label validation (istio#56737)
  Initial support for ListenerSet (istio#55595)
  feat: better istioctl ps output (istio#56441)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@keithmattix keithmattix keithmattix approved these changes

@stevenctl stevenctl stevenctl approved these changes

Assignees

@keithmattix keithmattix

Labels

cherrypick/release-1.26 Set this label on a PR to auto-merge it to the release-1.26 branch lifecycle/staleproof Indicates a PR or issue has been deemed to be immune from becoming stale and/or automatically closed release-notes-none Indicates a PR that does not require release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@howardjohn @istio-testing @PT-GD @keithmattix @stevenctl @istio-policy-bot