Skip to content

Fix of selinux directories #600

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

Merged
mangelajo merged 2 commits into from
Feb 9, 2022
Merged

Fix of selinux directories #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7634983
fix of selinux directories
cooktheryan Feb 7, 2022
e286ca3
include selinux labeling only if enabled
cooktheryan Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
%define selinux_policyver 3.14.3-67
%define container_policyver 2.167.0-1
%define container_policy_epoch 2
%define microshift_relabel_files() \
mkdir -p /var/hpvolumes; \
mkdir -p /var/run/flannel; \
mkdir -p /var/run/kubelet; \
mkdir -p /var/lib/kubelet/pods; \
mkdir -p /var/run/secrets/kubernetes.io/serviceaccount; \
restorecon -R /var/hpvolumes; \
restorecon -R /var/run/kubelet; \
restorecon -R /var/run/flannel; \
restorecon -R /var/lib/kubelet/pods; \
restorecon -R /var/run/secrets/kubernetes.io/serviceaccount


# Git related details
Expand Down Expand Up @@ -157,7 +168,6 @@ mkdir -p -m755 %{buildroot}/var/run/flannel
mkdir -p -m755 %{buildroot}/var/run/kubelet
mkdir -p -m755 %{buildroot}/var/lib/kubelet/pods
mkdir -p -m755 %{buildroot}/var/run/secrets/kubernetes.io/serviceaccount
mkdir -p -m755 %{buildroot}/var/hpvolumes

install -d %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}
install -m644 packaging/selinux/microshift.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}
Expand All @@ -177,7 +187,7 @@ fi
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/microshift.pp.bz2
if /usr/sbin/selinuxenabled ; then
%microshift_relabel_files
fi;
fi

%postun selinux

Expand Down Expand Up @@ -208,11 +218,13 @@ fi
/var/run/kubelet
/var/lib/kubelet/pods
/var/run/secrets/kubernetes.io/serviceaccount
/var/hpvolumes
%{_datadir}/selinux/packages/%{selinuxtype}/microshift.pp.bz2
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/microshift

%changelog
* Mon Feb 7 2022 Ryan Cook <rcook@redhat.com> . 4.8.0-0.microshiftr-2022_02_02_194009_3
- Selinux directory creation and labeling

* Wed Feb 2 2022 Ryan Cook <rcook@redhat.com> . 4.8.0-0.microshift-2022_01_04_175420_25
- Define specific selinux policy version to help manage selinux package

Expand Down