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

Add el9 selinux rpm #7443

Merged
merged 10 commits into from
May 24, 2023
Merged

Conversation

galal-hussein
Copy link
Contributor

Proposed Changes

  • Since we added el9 to k3s-selinux we should distinctly specify it in the install script.
  • Added also rocky-9 install test to the unit tests using "testing channel" until k3s selinux is released as stable or rpm with the new changes and distros

Types of Changes

Install script

Testing

Linked Issues

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
@galal-hussein galal-hussein requested a review from a team as a code owner May 5, 2023 20:32
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
@@ -518,7 +518,7 @@ setup_selinux() {
rpm_target=el7
rpm_site_infix=centos/7
package_installer=yum
elif [ "${VERSION_ID%%.*}" = "8" ]; then
elif [ "${VERSION_ID%%.*}" = "8" ] || [ "${VERSION_ID%%.*}" = "37" ]; then
Copy link
Member

Choose a reason for hiding this comment

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

is Fedora 37 the only one that needs the EL8 packages, instead of EL7 or EL9?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

as far as I can see yes, it needs el8

Copy link

Choose a reason for hiding this comment

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

I recommend >= "37" so it can work for future releases of fedora.

Copy link
Member

Choose a reason for hiding this comment

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

Well I think 38 and newer need EL9 packages, and 36 needs EL7? I'm not sure, but some clarification would be good.

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
@galal-hussein
Copy link
Contributor Author

I added a new modification to the PR to fix a problem with the upgrade:

The problem:

  • el9 that has old container-selinux (2.189) and k3s-selinux policy
  • upon upgrade the container-selinux to (2.205) it fails to upgrade because of existing k3s-selinux policy that exist in place.

To fix that we should either disable or remove k3s-selinux policy before upgrading container-selinux.

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
install.sh Outdated Show resolved Hide resolved
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
@galal-hussein galal-hussein merged commit d55ec08 into k3s-io:master May 24, 2023
galal-hussein added a commit to galal-hussein/k3s that referenced this pull request May 25, 2023
galal-hussein added a commit to galal-hussein/k3s that referenced this pull request May 25, 2023
This reverts commit d55ec08.

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
galal-hussein added a commit that referenced this pull request May 25, 2023
This reverts commit d55ec08.

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
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.

5 participants