packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!149 fix no module named v1_event for mgr k8sevent

Browse Source 
From: @ikernel-mryao 
Reviewed-by: @liuqinfei 
Signed-off-by: @liuqinfei
This commit is contained in:
openeuler-ci-bot 2023-01-03 06:13:35 +00:00 committed by Gitee
commit 65e94f8975
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0011-fix-no-module-named-v1_event-for-mgr-k8sevent.patch Normal file
View File

@ -0,0 +1,38 @@
From a4c108a75e1240403813c96c022161a7ca33bbae Mon Sep 17 00:00:00 2001
From: liyuanyuan <liyuanyuan@xfusion.com>
Date: Thu, 15 Dec 2022 21:41:04 +0800
Subject: [PATCH] fix no module named v1_event for mgr/k8sevent
---
src/pybind/mgr/k8sevents/module.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/pybind/mgr/k8sevents/module.py b/src/pybind/mgr/k8sevents/module.py
index 1e12d1f27..66235e8f8 100644
--- a/src/pybind/mgr/k8sevents/module.py
+++ b/src/pybind/mgr/k8sevents/module.py
@@ -53,6 +53,9 @@ finally:
event_queue = queue.Queue()
try:
+ import kubernetes
+ from distutils.version import StrictVersion
+
from kubernetes import client, config, watch
from kubernetes.client.rest import ApiException
except ImportError:
@@ -67,7 +70,10 @@ else:
# which causes an exception in the generator. A workaround is discussed for a similar issue
# in https://github.com/kubernetes-client/python/issues/376 which has been used here
# pylint: disable=no-member
- from kubernetes.client.models.v1_event import V1Event
+ if kubernetes.__version__ <= StrictVersion("18.20.0"):
+ from kubernetes.client.models.v1_event import V1Event
+ else:
+ from kubernetes.client.models.core_v1_event import CoreV1Event as V1Event
def local_involved_object(self, involved_object):
if involved_object is None:
involved_object = client.V1ObjectReference(api_version="1")
--
2.27.0

6
ceph.spec
View File

@ -125,7 +125,7 @@
#################################################################################
Name: ceph
Version: 16.2.7
Release: 12
Release: 13
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2
%endif
@ -153,6 +153,7 @@ Patch7: 0007-bluestore-use-direct-write-for-bdevlabel.patch
Patch8: 0008-enable-sw64-architecture.patch
Patch9: 0009-fix-CVE-2022-0670.patch
Patch10: 0010-fix-CVE-2022-3650.patch
Patch11: 0011-fix-no-module-named-v1_event-for-mgr-k8sevent.patch
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -2488,6 +2489,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
* Wed Dec 28 2022 yaoguangzhong <yaoguangzhong@xfusion.com> - 2:16.2.7-13
- fix no module named v1_event for mgr/k8sevent
* Tue Dec 20 2022 wanglin <wangl29@chinatelecom.cn> - 2:16.2.7-12
- use vendor macro in buildrequire package