chore: sync RHDH infrastructure to 1.10.2 (Backstage 1.49.4) - #364
Merged
Conversation
|
Important Review skippedToo many files! This PR contains 394 files, which is 294 over the limit of 100. To get a review, reduce the PR to 100 files or fewer by splitting it into smaller PRs or changing its base branch. Upgrade to a paid plan to raise the limit. Usage-priced reviews support at most 300 files. ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (4)
📒 Files selected for processing (394)
You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
R-Lawton
marked this pull request as ready for review
August 4, 2026 13:52
jasonmadigan
reviewed
Aug 4, 2026
jasonmadigan
reviewed
Aug 4, 2026
jasonmadigan
reviewed
Aug 4, 2026
Anton-Fil
requested changes
Aug 4, 2026
| "@testing-library/dom": "9.3.4", | ||
| "@testing-library/jest-dom": "6.9.1", | ||
| "@testing-library/react": "16.3.0", | ||
| "@testing-library/react": "14.3.1", |
Contributor
There was a problem hiding this comment.
this goes backwards — main has 16.3.0 here, this downgrades to 14.3.1. Looks like it was accidentally normalised to match packages/app. Should be bumped back up.
Contributor
Author
There was a problem hiding this comment.
good catch, fixed in 75d9501 -- restored to 16.3.0
| "yaml": "2.8.1" | ||
| "@backstage/cli": "0.36.0", | ||
| "@backstage/cli-defaults": "0.1.0", | ||
| "glob": "11.1.0", |
Contributor
There was a problem hiding this comment.
same issue — main has glob@12.0.0, this reverts to 11.1.0. Needs bumping back.
Contributor
Author
There was a problem hiding this comment.
good catch, fixed in 75d9501 -- restored to 12.0.0
| @@ -155,7 +155,7 @@ function getAuthProviderFactory( | |||
| authenticator: githubAuthenticator, | |||
| ...applySignInResolvers({ | |||
| signInResolver: | |||
| githubSignInResolvers.usernameMatchingUserEntityName(), | |||
| githubSignInResolvers.userIdMatchingUserEntityAnnotation(), | |||
Contributor
There was a problem hiding this comment.
heads up — this changes the GitHub (and GitLab on line 170) sign-in resolver from username matching to user ID annotation matching. Any existing deployment that doesn't have github.com/user-id annotations on User entities in the catalog will break on upgrade. Worth calling out explicitly in the PR description or release notes.
Contributor
Author
There was a problem hiding this comment.
great callout 👀 this is an upstream change -- added a "Breaking change from upstream" section to the PR description to flag it. our dev setup uses dex/OIDC so it won't affect local dev, but worth knowing for anyone using github/gitlab auth directly.
jasonmadigan
previously approved these changes
Aug 4, 2026
Contributor
|
pls sign |
Update the RHDH base from 1.8.4 to 1.10.2, bringing Backstage from 1.42.5 to 1.49.4. All Kuadrant-specific code is preserved. Key changes: - Bump all @backstage/* deps to 1.49.4 release versions - @backstage/plugin-catalog-react 1.20.1 -> 2.1.1 (major) - @backstage/cli 0.34.1 -> 0.36.0 (jest 30, cli-defaults) - @red-hat-developer-hub/cli ~1.9.0 -> ~1.10.0 - Remove 42 deprecated dynamic plugin wrappers, add 3 new ones - Remove variant="gridItem" props dropped in new Backstage - Sync internal RHDH plugins, patches, and build scripts Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: R-Lawton <rlawton@redhat.com>
- Set node engine to "22" in dynamic-plugins/package.json to match .nvmrc and root package.json (was "24" from upstream) - Remove commented-out RHIDP-10876 code from wrappers.test.ts Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: R-Lawton <rlawton@redhat.com>
- Restore @testing-library/react to 16.3.0 in app-next (upstream had 14.3.1 but main already bumped it) - Restore glob to 12.0.0 in dynamic-plugins/_utils (upstream had 11.1.0 but main already bumped it) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: R-Lawton <rlawton@redhat.com>
R-Lawton
force-pushed
the
rhdh-sync-1.10.2
branch
from
August 6, 2026 09:05
75d9501 to
dcee831
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
@backstage/*dependencies to match the 1.49.4 release manifestKey version changes
@backstage/cli@backstage/plugin-catalog-react@backstage/core-components@backstage/backend-plugin-api@red-hat-developer-hub/cliWhat changed
extensions,extensions-backend,catalog-backend-module-extensions)dynamic-plugins-info-backend,licensed-users-info-backend,scalprum-backend)variant="gridItem"props dropped in new@backstage/plugin-catalog,@backstage/plugin-catalog-graph, and@backstage/plugin-orgBreaking change from upstream
GitHub/GitLab sign-in resolver (
packages/backend/src/modules/authProvidersModule.ts): The upstream changed GitHub and GitLab sign-in resolvers fromusernameMatchingUserEntityName()touserIdMatchingUserEntityAnnotation(). This means deployments using GitHub/GitLab auth will needgithub.com/user-id(orgitlab.com/user-id) annotations on their User entities in the catalog. Our dev setup uses dex/OIDC so this doesn't affect local development, but any deployment relying on GitHub/GitLab username matching will need to add the user ID annotations before upgrading.Kuadrant files preserved (not overwritten)
plugins/kuadrant/**,plugins/kuadrant-backend/**kuadrant-dev-setup/**,app-config.yaml,app-config.local.yaml,rbac-policy.csvCLAUDE.md,.claude/**,docs/**,e2e-tests/**,.github/**packages/app/src/andpackages/backend/src/Test plan
yarn tsc— all 8 packages compileyarn build— all 17 tasks passyarn test— all 9 test packages passyarn dev+ kind cluster🤖 Generated with Claude Code