Merge pull request #33975 from bart0sh/PR055-crio_cgroupv2_splitfs-ru…

…n-semanage-before-crio crio_cgroupv2_splitfs.ign: run semanage before crio install
kubernetes · Dec 17, 2024 · fbb1e3e · fbb1e3e
2 parents fcd94c9 + e0b8085
commit fbb1e3e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/jobs/e2e_node/crio/crio_cgroupv2_splitfs.ign b/jobs/e2e_node/crio/crio_cgroupv2_splitfs.ign
@@ -116,7 +116,7 @@
         "name": "authorized-key.service"
       },
       {
-        "contents": "[Unit]\nDescription=Label ImageStore\nAfter=crio-install.service\n\n[Service]\nType=oneshot\nExecStart=rpm-ostree install \\\n  -y \\\n  --apply-live \\\n  --allow-inactive \\\n  policycoreutils-python-utils\nExecStart=semanage fcontext -a -e /var/lib/containers/storage /var/lib/images\nExecStart=restorecon -R -v /var/lib/images\n\n[Install]\nWantedBy=multi-user.target\n",
+        "contents": "[Unit]\nDescription=Label ImageStore\nAfter=selinux-install.service\nBefore=crio-install.service\n\n[Service]\nType=oneshot\nExecStart=rpm-ostree install \\\n  -y \\\n  --apply-live \\\n  --allow-inactive \\\n  policycoreutils-python-utils\nExecStart=semanage fcontext -a -e /var/lib/containers/storage /var/lib/images\nExecStart=restorecon -R -v /var/lib/images\n\n[Install]\nWantedBy=multi-user.target\n",
         "enabled": true,
         "name": "label-imagestore.service"
       }

diff --git a/jobs/e2e_node/crio/templates/base/splitfs.yaml b/jobs/e2e_node/crio/templates/base/splitfs.yaml
@@ -28,7 +28,8 @@ systemd:
       contents: |
         [Unit]
         Description=Label ImageStore
-        After=crio-install.service
+        After=selinux-install.service
+        Before=crio-install.service
 
         [Service]
         Type=oneshot

diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv2_splitfs.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv2_splitfs.yaml
@@ -147,7 +147,8 @@ systemd:
       contents: |
         [Unit]
         Description=Label ImageStore
-        After=crio-install.service
+        After=selinux-install.service
+        Before=crio-install.service
 
         [Service]
         Type=oneshot