From 22f61dca3616c9074085ae04d39d207c6d2dcbcd Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Wed, 2 Feb 2022 11:31:23 +0100 Subject: [PATCH] Remove the microshift-containerized subpackage Our docs explain how to download the .service file [1] instead, and it has proven problematic to package this. Fix the microshift.service being overwritten by microshift-containerized, even when the non-containerized package only is installed. Resolves-Issue: #591 Signed-off-by: Miguel Angel Ajo --- packaging/rpm/microshift.spec | 54 +++++------------------------------ 1 file changed, 7 insertions(+), 47 deletions(-) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 39dc364f6a..097924c8b6 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -78,44 +78,6 @@ systems, scale testing, and provisioning of lightweight Kubernetes control plane Note: MicroShift is still early days and moving fast. Features are missing. Things break. But you can still help shape it, too. -%package containerized -Summary: Containerized systemd files for MicroShift -BuildArch: noarch -Requires: crio -Requires: cri-tools -Requires: microshift-selinux -Requires: podman -%{?selinux_requires} - -%description containerized -This is the containerized version of MicroShift. - -MicroShift is a research project that is exploring how OpenShift Kubernetes -can be optimized for small form factor and edge computing. - -Edge devices deployed out in the field pose very different operational, -environmental, and business challenges from those of cloud computing. -These motivate different engineering -trade-offs for Kubernetes at the far edge than for cloud or near-edge -scenarios. MicroShift's design goals cater to this: - -make frugal use of system resources (CPU, memory, network, storage, etc.), -tolerate severe networking constraints, update (resp. roll back) securely, -safely, speedily, and seamlessly (without disrupting workloads), and build on -and integrate cleanly with edge-optimized OSes like Fedora IoT and RHEL for Edge, -while providing a consistent development and management experience with standard -OpenShift. - -We believe these properties should also make MicroShift a great tool for other -use cases such as Kubernetes applications development on resource-constrained -systems, scale testing, and provisioning of lightweight Kubernetes control planes. - -Note: MicroShift is still early days and moving fast. Features are missing. -Things break. But you can still help shape it, too. - -%define microshift_relabel_files() \ -restorecon -R /var/hpvolumes - %package selinux Summary: SELinux policies for MicroShift BuildRequires: selinux-policy @@ -186,7 +148,6 @@ install -p -m644 packaging/crio.conf.d/microshift.conf %{buildroot}%{_sysconfdir install -d -m755 %{buildroot}/%{_unitdir} install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service -install -p -m644 packaging/systemd/microshift-containerized.service %{buildroot}%{_unitdir}/microshift-containerized.service mkdir -p -m755 %{buildroot}/var/run/flannel mkdir -p -m755 %{buildroot}/var/run/kubelet @@ -220,9 +181,6 @@ if [ $1 -eq 0 ]; then %selinux_modules_uninstall -s %{selinuxtype} microshift fi -%post containerized -mv /usr/lib/systemd/system/microshift-containerized.service /usr/lib/systemd/system/microshift.service - %posttrans selinux %selinux_relabel_post -s %{selinuxtype} @@ -250,11 +208,13 @@ mv /usr/lib/systemd/system/microshift-containerized.service /usr/lib/systemd/sys %{_datadir}/selinux/packages/%{selinuxtype}/microshift.pp.bz2 %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/microshift -%files containerized - -%{_unitdir}/microshift-containerized.service - %changelog +* Wed Feb 2 2022 Miguel Angel Ajo . 4.8.0-0.microshift-2022-01-06-210147-20 +- Remove the microshift-containerized subpackage, our docs explain how to download the .service file, + and it has proven problematic to package this. +- Fix the microshift.service being overwritten by microshift-containerized, even when the non-containerized + package only is installed. + * Thu Nov 4 2021 Miguel angel Ajo . 4.8.0-nightly-14-g973b9c78 - Add microshift-containerized subpackage which contains the microshift-containerized systemd definition. @@ -269,4 +229,4 @@ mv /usr/lib/systemd/system/microshift-containerized.service /usr/lib/systemd/sys - add missing BuildRequires on systemd and policycoreutils * Mon Sep 20 2021 Miguel Angel Ajo . 4.7.0-2021_08_31_224727 -- Initial packaging \ No newline at end of file +- Initial packaging