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

[v16] Update proxy features #47039

Merged
merged 23 commits into from
Oct 8, 2024
Merged

Conversation

mcbattirola
Copy link
Contributor

@mcbattirola mcbattirola commented Oct 1, 2024

Backport #45979 to branch/v16

teleport.e PR: https://github.com/gravitational/teleport.e/pull/5104

@mcbattirola mcbattirola added the no-changelog Indicates that a PR does not require a changelog entry label Oct 1, 2024
@mcbattirola mcbattirola marked this pull request as ready for review October 3, 2024 16:15
@rosstimothy
Copy link
Contributor

Is there any way to move forward with the backports without breaking the ent builds/tests?

@mcbattirola
Copy link
Contributor Author

Is there any way to move forward with the backports without breaking the ent builds/tests?

I've opened the teleport.e backport and will only merge this one once the enterprise backport is approved, that should minimize the time the build is broken.

The only change in this PR that breaks the tests/build is renaming ClusterFeatures to clusterFeatures. I can undo that and, once the teleport.e PR lands, I can open a new PR to make it unexported again. That is more work but won't break the build, is that preferable to breaking the build for a few minutes?

@rosstimothy
Copy link
Contributor

It's always preferable if changes across oss and ent can be coordinated in a way that doesn't break the build, even if the break is only for a short period of time.

@mcbattirola
Copy link
Contributor Author

@rosstimothy thanks, I've pushed a commit 111a174 that will prevent the teleport.e build from failing. Once the enterprise PR is backported, I'll create a new PR to revert it.

Copy link
Contributor

@rosstimothy rosstimothy left a comment

Choose a reason for hiding this comment

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

Thanks @mcbattirola!

@mcbattirola mcbattirola enabled auto-merge October 7, 2024 15:54
@mcbattirola mcbattirola added this pull request to the merge queue Oct 8, 2024
Merged via the queue into branch/v16 with commit e447917 Oct 8, 2024
39 checks passed
@mcbattirola mcbattirola deleted the bot/backport-45979-branch/v16 branch October 8, 2024 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport no-changelog Indicates that a PR does not require a changelog entry size/md
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants