diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-21 02:27:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-21 02:27:13 +0000 |
| commit | e22f8c6576e87dcfb42d10c71d4b06260ca9f722 (patch) | |
| tree | a010f9d27fb5769eeaee24d7dcd762a6b0ff87ae /src/pybind/mgr | |
| parent | Adding upstream version 18.2.3. (diff) | |
| download | ceph-e22f8c6576e87dcfb42d10c71d4b06260ca9f722.tar.xz ceph-e22f8c6576e87dcfb42d10c71d4b06260ca9f722.zip | |
Adding upstream version 18.2.4.upstream/18.2.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/pybind/mgr')
| -rw-r--r-- | src/pybind/mgr/k8sevents/module.py | 18 | ||||
| -rw-r--r-- | 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 b34029209..5855ba42e 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 7daee3323..044674f9b 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 |