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

fix: Enhance spec "satellite_settings" and parser to support satellite 6.14 #3952

Merged
merged 3 commits into from
Nov 16, 2023
Merged

Conversation

huali027
Copy link
Contributor

@huali027 huali027 commented Nov 14, 2023

  • Since satellite 6.14, the column "default" has been deleted from the satellite_settings table.

All Pull Requests:

Check all that apply:

  • Have you followed the guidelines in our Contributing document, including the instructions about commit messages?
  • Is this PR to correct an issue?
  • Is this PR an enhancement?

@huali027
Copy link
Contributor Author

@xiangce @JoySnow Please help to review, thanks.

SkipComponent: When the Satellite version is earlier than 6.14.
"""
def __init__(self, sat):
if sat.major == 6 and sat.minor < 14:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hi @huali027 , the code looks good to me. Jut one concern here.

I am new to Satellite things, and just from the code, I guess that a "Satellite 5.x" will also hit this IsSatellite614AndLater component.
Do we process only "Satellite 6" systems, or something are already be done to assured for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JoySnow From previous statistics, only 5 satellite 5.x hosts on production now. In fact, in our rule, we only support the satellite versions which are supported now, like 6.11, 6.12, 6.13, 6.14, and 6.11 will be expired soon. Normally three versions are supported.
But if I limit the version here, I should update it from time to time. So I don't add more limitation. If the command doesn't work on some versions, it just fails to get the result.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JoySnow I updated it to exclude satellite 5.x as discussed.
@xiangce Please help to review too.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks @huali027 , the code looks good to me .

…e 6.14

* Since satellite 6.14, the column "default" has been deleted
  from satellite_settings table.

Signed-off-by: Huanhuan Li <huali@redhat.com>
* Exclude satellite 5.x

Signed-off-by: Huanhuan Li <huali@redhat.com>
Signed-off-by: Huanhuan Li <huali@redhat.com>
@xiangce xiangce merged commit 50b8ce9 into RedHatInsights:master Nov 16, 2023
xiangce pushed a commit that referenced this pull request Nov 16, 2023
…e 6.14 (#3952)

* fix: Enhance spec "satellite_settings" and parser to support satellite 6.14

- Since satellite 6.14, the column "default" has been deleted
  from satellite_settings table.

Signed-off-by: Huanhuan Li <huali@redhat.com>

* Exclude satellite 5.x
* Add parenthese to make statement  more clear

Signed-off-by: Huanhuan Li <huali@redhat.com>
(cherry picked from commit 50b8ce9)
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.

3 participants