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.

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

Sync subscription code from rhel 9 #5982

Merged
merged 4 commits into from
Nov 11, 2024
Merged

Sync subscription code from rhel 9 #5982

merged 4 commits into from
Nov 11, 2024

Conversation

M4rtinK
Copy link
Contributor

@M4rtinK M4rtinK commented Nov 5, 2024

This PR syncs the RHEL 9 subscription code, which includes:

  • Satellite support
  • better UX for Simple Content Access (SCA)
  • various subscription related fixes that were not yet upstream-ed for technical reasons

Also as entitlement support has been dropped in RHEL 10, with only SCA being supported going forward, the PR also drops code related to parsing and displaying entitlements.

While this PR is targeting RHEL 10 first, my intention is to open an upstream PR once this one is merged, to avoid any further de-sync of the subscription support codebase going forward.

@pep8speaks
Copy link

pep8speaks commented Nov 5, 2024 •
edited
Loading

Hello @M4rtinK! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2024-11-08 11:27:47 UTC

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 5, 2024

How does it look like
Can you spot the difference ?

Before
previous_spoke
Without Satellite support, there is no Satellite URL entry field & it is not possible to really register to Satellite, as the provisioning script will not be run.

rhel_9_entitlements
Upon registering in entitlement mode, list of attached entitlements is shown (shown on RHEL 9).

After

satellite_url
Satellite URL can now be entered & the backend logic will do what is necessary to properly point the installed system to the chosen Satellite instance.

registered
The system has been registered to Satellite & is registered in SCA mode (the only mode supported on RHEL 10). Note the lack of listed entitlements, as those are no longer a thing.

hub
Registration to Satellite is reflected also in the spoke statuses visible on the summary hub.

@M4rtinK M4rtinK force-pushed the rhel-10-sync_subscription_code_from_rhel_9 branch from f3b2dc7 to da4164c Compare November 5, 2024 17:28
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 5, 2024

/kickstart-test --testtype smoke

@M4rtinK
Bump minimal subscription manager versions
d7bd942 
Make sure we have recent enough RHSM version so that
the necessary baseline for Satellite support and other
modern subscription features (and Anaconda relevant fixes) are in places.

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3063
@M4rtinK M4rtinK force-pushed the rhel-10-sync_subscription_code_from_rhel_9 branch from da4164c to 85f0310 Compare November 5, 2024 17:40
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 5, 2024

/kickstart-test --testtype smoke

@M4rtinK M4rtinK force-pushed the rhel-10-sync_subscription_code_from_rhel_9 branch from 85f0310 to 5185281 Compare November 6, 2024 10:15
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 6, 2024

/kickstart-test --testtype smoke

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 6, 2024

/kickstart-test --skip-testtypes whatever

@M4rtinK M4rtinK force-pushed the rhel-10-sync_subscription_code_from_rhel_9 branch from 5185281 to 9d6efd8 Compare November 8, 2024 09:39
rvykydal
rvykydal approved these changes Nov 8, 2024
View reviewed changes
Copy link
Contributor

@rvykydal rvykydal left a comment

Choose a reason for hiding this comment

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

Looks good to me.
I was able to find just a few harmless typos.

pyanaconda/modules/subscription/utils.py Outdated Show resolved Hide resolved
pyanaconda/modules/subscription/utils.py Outdated Show resolved Hide resolved
pyanaconda/ui/lib/subscription.py Outdated Show resolved Hide resolved
tests/unit_tests/pyanaconda_tests/modules/subscription/test_subscription_tasks.py Outdated Show resolved Hide resolved
@M4rtinK
Subscription code updates - backend
4709e7b 
This commit contains basically 3 things:
* Satellite support ported for the RHEL 9 branch, adjusted
  for changes done in upstream since RHEL 9 has been branched
* all Satellite support & subscription code fixes from the RHEL 9 branch
* removal of entitlement support as entitlements are no longer supported
  in RHEL 10 & Simple Content Access (SCA) is always used instead

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
@M4rtinK
Subscription code updates - GTK GUI
a006ed0 
Adjust the GTK GUI for the Subscription code changes:
- reflect Satellite being used in the GUI
- better UX when Simple Content Access (SCA) is used
- drop support for displaying attached entitlements
  (support for entitlements has been dropped in RHEL 10 system-wide)

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
@M4rtinK
Subscription code updates - adjust unit tests
7a151a5 
Adjust to Satellite support being added & entitlement support being
dropped. There were also some changes in how the registration tasks are
structured internally & unit tests need to be adjusted for that as well.

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
@M4rtinK M4rtinK force-pushed the rhel-10-sync_subscription_code_from_rhel_9 branch from 9d6efd8 to 7a151a5 Compare November 8, 2024 11:27
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 11, 2024

/kickstart-test --testtype smoke

@M4rtinK M4rtinK added the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Nov 11, 2024
@M4rtinK M4rtinK merged commit 8bb5ddd into rhinstaller:rhel-10 Nov 11, 2024
14 of 15 checks passed
@M4rtinK M4rtinK mentioned this pull request Nov 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvykydal rvykydal rvykydal approved these changes

Assignees
No one assigned
Labels
ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). rhel-10
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@M4rtinK @pep8speaks @rvykydal