Skip to content

OCPBUGS-31661: Remove references to redundant files in selinux packaging #3296

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
openshift-merge-bot merged 1 commit into from
Apr 30, 2024
Merged

OCPBUGS-31661: Remove references to redundant files in selinux packaging #3296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@
%global selinuxtype targeted
%define selinux_policyver 3.14.3-67
%define microshift_relabel_files() \
mkdir -p /var/run/kubelet; \
mkdir -p /var/lib/kubelet/pods; \
mkdir -p /etc/microshift; \
mkdir -p /usr/lib/microshift; \
mkdir -p /var/run/secrets/kubernetes.io/serviceaccount; \
mkdir -p /var/lib/microshift-backups; # Creating folder to avoid GreenBoot race condition so that correct label is applied \
restorecon -R /var/run/kubelet; \
restorecon -R /var/lib/kubelet/pods; \
restorecon -R /var/run/secrets/kubernetes.io/serviceaccount; \
restorecon -R /var/lib/microshift-backups; \
restorecon -R /etc/microshift; \
restorecon -R /usr/lib/microshift
Expand Down Expand Up @@ -289,9 +285,7 @@ install -p -m755 packaging/systemd/configure-ovs-microshift.sh %{buildroot}%{_bi
mkdir -p -m755 %{buildroot}%{_sysconfdir}/systemd/system/firewalld.service.d
install -p -m644 packaging/systemd/firewalld-no-iptables.conf %{buildroot}%{_sysconfdir}/systemd/system/firewalld.service.d/firewalld-no-iptables.conf

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

install -d %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}
install -m644 packaging/selinux/microshift.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}
Expand Down Expand Up @@ -433,11 +427,9 @@ fi
%{_datadir}/microshift/blueprint/blueprint*.toml

%files selinux
/var/run/kubelet
/var/lib/kubelet/pods
/var/run/secrets/kubernetes.io/serviceaccount
%{_datadir}/selinux/packages/%{selinuxtype}/microshift.pp.bz2
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/microshift


%files networking
%{_sysconfdir}/crio/crio.conf.d/11-microshift-ovn.conf
Expand Down Expand Up @@ -478,6 +470,9 @@ fi
# Use Git command to generate the log and replace the VERSION string
# LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
%changelog
* Mon Apr 29 2024 Gregory Giguashvili <ggiguash@redhat.com> 4.16.0
- Remove references to redundant files in selinux packaging

* Tue Apr 23 2024 Patryk Matuszak <pmatusza@redhat.com> 4.16.0
- Restart CRI-O on microshift-multus RPM install

Expand Down