Skip to content

packages: Make our sosreport package compatible with new sos version #3664

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
merged 1 commit into from
Jan 14, 2022
Merged

packages: Make our sosreport package compatible with new sos version #3664

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
and enable Grafana folder generation from dashboard file structure (PR
[#3620](https://github.com/scality/metalk8s/pull/3620))

- [#3387](https://github.com/scality/metalk8s/issues/3387) - Make
metalk8s-sosreport package compatible with sos version 4.0+
(PR[#3664](https://github.com/scality/metalk8s/pull/3664))

## Bug fixes

- [#3601](https://github.com/scality/metalk8s/issues/3601) - Marks
Expand Down
5 changes: 2 additions & 3 deletions buildchain/buildchain/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
K8S_VERSION: str = "1.22.5"
SALT_VERSION: str = "3002.7"
CONTAINERD_VERSION: str = "1.5.8"
SOS_VERSION: str = "< 4.0"

CALICO_RELEASE: str = "1"
CONTAINERD_RELEASE: str = "1"
Expand Down Expand Up @@ -362,8 +361,6 @@ def rpm_full_name(self) -> str:
PackageVersion(name="runc"),
PackageVersion(name="salt-minion", version=SALT_VERSION),
PackageVersion(name="socat"),
# TODO download built package dependencies
PackageVersion(name="sos", version=SOS_VERSION),
PackageVersion(name="util-linux"),
PackageVersion(name="yum-utils"),
PackageVersion(name="xfsprogs"),
Expand All @@ -381,6 +378,7 @@ def rpm_full_name(self) -> str:
release="{0}.el7".format(CONTAINERD_RELEASE),
),
PackageVersion(name="container-selinux"), # TODO #1710
PackageVersion(name="sos", version="< 4.0"),
PackageVersion(
name="metalk8s-sosreport",
version=SHORT_VERSION,
Expand All @@ -401,6 +399,7 @@ def rpm_full_name(self) -> str:
),
PackageVersion(name="container-selinux"),
PackageVersion(name="iptables-ebtables", override="ebtables"),
PackageVersion(name="sos", version=">= 4.0"),
PackageVersion(
name="metalk8s-sosreport",
version=SHORT_VERSION,
Expand Down
6 changes: 5 additions & 1 deletion packages/common/metalk8s-sosreport/containerd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#! /bin/env python3

from sos.plugins import Plugin, RedHatPlugin
# sos plugin layout changed in sos 4.0
try:
from sos.report.plugins import Plugin, RedHatPlugin
except ImportError:
from sos.plugins import Plugin, RedHatPlugin


class containerd(Plugin, RedHatPlugin):
Expand Down
7 changes: 6 additions & 1 deletion packages/common/metalk8s-sosreport/metalk8s.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
from os import path

import requests
from sos.plugins import Plugin, RedHatPlugin

# sos plugin layout changed in sos 4.0
try:
from sos.report.plugins import Plugin, RedHatPlugin
except ImportError:
from sos.plugins import Plugin, RedHatPlugin


class metalk8s(Plugin, RedHatPlugin):
Expand Down
34 changes: 19 additions & 15 deletions packages/redhat/common/metalk8s-sosreport.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ Summary: Metalk8s SOS report custom plugins

BuildRequires: /usr/bin/pathfix.py

# Does not work with 4.0.0 and later
Requires: sos >= 3.1, sos < 4.0
# sos layout changed in version 4.0, in order to make things simpler
# let's consider we have sos >= 4.0 for RHEL 8+ and sos < 4.0 for RHEL 7
%if 0%{rhel} >= 8
Requires: sos >= 4.0
Requires: python3 >= 3.6
%else
Requires: sos >= 3.1, sos < 4.0
Requires: python >= 2.6, python < 2.8
# NameError on FileNotFoundError in sos 3.5 python2.7
Conflicts: sos = 3.5
Expand All @@ -27,14 +29,16 @@ Source1: ../../common/metalk8s-sosreport/containerd.py

%if 0%{rhel} >= 8
%define python_lib %{python3_sitelib}
%define report_plugins %{python_lib}/sos/report/plugins
%else
%define python_lib %{python_sitelib}
%define report_plugins %{python_lib}/sos/plugins
%endif

%install
install -m 755 -d %{buildroot}/%{python_lib}/sos/plugins
install -p -m 755 %{_topdir}/SOURCES/metalk8s.py %{buildroot}/%{python_lib}/sos/plugins/metalk8s.py
install -p -m 755 %{_topdir}/SOURCES/containerd.py %{buildroot}/%{python_lib}/sos/plugins/containerd.py
install -m 755 -d %{buildroot}/%{report_plugins}
install -p -m 755 %{_topdir}/SOURCES/metalk8s.py %{buildroot}/%{report_plugins}/metalk8s.py
install -p -m 755 %{_topdir}/SOURCES/containerd.py %{buildroot}/%{report_plugins}/containerd.py
%if 0%{rhel} >= 8
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python_lib}
%else
Expand All @@ -43,18 +47,18 @@ pathfix.py -pni "%{__python} %{py_shbang_opts}" %{buildroot}%{python_lib}

%files
%defattr(-,root,root)
%{python_lib}/sos/plugins/containerd.py
%{python_lib}/sos/plugins/metalk8s.py
%{report_plugins}/containerd.py
%{report_plugins}/metalk8s.py
%if 0%{rhel} >= 8
%{python_lib}/sos/plugins/__pycache__/containerd.cpython-%{python3_version_nodots}.pyc
%{python_lib}/sos/plugins/__pycache__/containerd.cpython-%{python3_version_nodots}.opt-?.pyc
%{python_lib}/sos/plugins/__pycache__/metalk8s.cpython-%{python3_version_nodots}.pyc
%{python_lib}/sos/plugins/__pycache__/metalk8s.cpython-%{python3_version_nodots}.opt-?.pyc
%{report_plugins}/__pycache__/containerd.cpython-%{python3_version_nodots}.pyc
%{report_plugins}/__pycache__/containerd.cpython-%{python3_version_nodots}.opt-?.pyc
%{report_plugins}/__pycache__/metalk8s.cpython-%{python3_version_nodots}.pyc
%{report_plugins}/__pycache__/metalk8s.cpython-%{python3_version_nodots}.opt-?.pyc
%else
%{python_lib}/sos/plugins/metalk8s.pyc
%{python_lib}/sos/plugins/containerd.pyc
%{python_lib}/sos/plugins/metalk8s.pyo
%{python_lib}/sos/plugins/containerd.pyo
%{report_plugins}/metalk8s.pyc
%{report_plugins}/containerd.pyc
%{report_plugins}/metalk8s.pyo
%{report_plugins}/containerd.pyo
%endif

%changelog
Expand Down