Skip to content
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.

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

srds: permit dynamic SRDS resources to contain inline RDS configuration #36703

Merged
merged 6 commits into from
Oct 31, 2024

Conversation

pianiststickman
Copy link
Contributor

Commit Message: permit dynamic SRDS resources to contain inline RDS configuration
Additional Description:
Currently, scoped_routes specified inline into the HCM may only contain inline route_configuration, and scoped_routes that are delivered via SRDS may only contain route_configuration_name which is used to open an RDS subscription. This PR permits resources delivered via SRDS to contain inline RouteConfiguration, forgoing the RDS subscription.

Risk Level: low
Testing: CI & integration
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Copy link

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #36703 was opened by pianiststickman.

see: more, trace.

Signed-off-by: Eugene Chan <[email protected]>
@pianiststickman pianiststickman marked this pull request as ready for review October 19, 2024 12:53
@mattklein123 mattklein123 self-assigned this Oct 21, 2024
@mattklein123
Copy link
Member

Thanks this makes sense. Can you add a release note please?

/wait

Signed-off-by: Eugene Chan <[email protected]>
@pianiststickman
Copy link
Contributor Author

/retest

mattklein123
mattklein123 previously approved these changes Oct 22, 2024
@mattklein123
Copy link
Member

/retest

@mattklein123 mattklein123 enabled auto-merge (squash) October 22, 2024 21:54
auto-merge was automatically disabled October 22, 2024 22:47

Head branch was pushed to by a user without write access

@pianiststickman
Copy link
Contributor Author

Ah, this is probably going to conflict with my other PR. I'll bring this out of draft when main is merged.

@pianiststickman pianiststickman marked this pull request as draft October 22, 2024 22:49
@pianiststickman
Copy link
Contributor Author

/retest

@pianiststickman pianiststickman marked this pull request as ready for review October 31, 2024 03:08
@mattklein123 mattklein123 merged commit e4e54f5 into envoyproxy:main Oct 31, 2024
21 checks passed
KBaichoo pushed a commit that referenced this pull request Nov 4, 2024
An extraneous if block was introduced merging #36702 into #36703. We're
checking this condition above in L282, so this block should never be
executed.

Commit Message: remove a redundant if block
Additional Description: n/a
Risk Level: low
Testing: existing CI
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Eugene Chan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants