From 6af964719217d720e6c2fd1ba2a607f6255d2604 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 3 May 2024 14:26:19 +0530 Subject: [PATCH] mgr/k8sevents: update V1Events to CoreV1Events centos9 only provides kubernetes 26.1.0 as base dep and hence the k8sevents code needs to be updated accordingly. the api changes happened in kuberenetes while 19.0.0 was released Fixes: https://tracker.ceph.com/issues/65627 Fixes: https://tracker.ceph.com/issues/64981 Signed-off-by: Nizamudeen A --- src/pybind/mgr/k8sevents/module.py | 18 +++++++++++------- src/pybind/mgr/requirements.txt | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/k8sevents/module.py b/src/pybind/mgr/k8sevents/module.py index b3402920974e5..5855ba42e1b3a 100644 --- a/src/pybind/mgr/k8sevents/module.py +++ b/src/pybind/mgr/k8sevents/module.py @@ -67,7 +67,11 @@ 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 + try: + from kubernetes.client.models.core_v1_event import CoreV1Event as V1Event + except ImportError: + from kubernetes.client.models.v1_event import V1Event + def local_involved_object(self, involved_object): if involved_object is None: involved_object = client.V1ObjectReference(api_version="1") @@ -409,14 +413,14 @@ class KubernetesEvent(object): event_source = client.V1EventSource(component="ceph-mgr", host=self.host) - return client.V1Event( - involved_object=obj_ref, - metadata=obj_meta, - message=self.message, - count=self.count, + return V1Event( + involved_object=obj_ref, + metadata=obj_meta, + message=self.message, + count=self.count, type=self.event_type, reason=self.event_reason, - source=event_source, + source=event_source, first_timestamp=self.first_timestamp, last_timestamp=self.last_timestamp ) diff --git a/src/pybind/mgr/requirements.txt b/src/pybind/mgr/requirements.txt index 7daee3323b8c6..044674f9be569 100644 --- a/src/pybind/mgr/requirements.txt +++ b/src/pybind/mgr/requirements.txt @@ -1,5 +1,5 @@ -rrequirements-required.txt asyncssh==2.9 -kubernetes==11.0.0 +kubernetes urllib3==1.26.15 pytest==7.4.4 -- 2.39.5