e2ab5cc2c8
Patch the python2-kubernetes-8.0.0-8.el7.noarch.rpm with recent bug fix commits required for proper kubernetes watch functionality. Patches watch.py up to commit 10ae476 in the 'base' repo (kubernetes-client/python-base). Commits are taken from the cloned github repo, saved in patch format, and applied as a patch to the source RPM. Reference: https://github.com/kubernetes-client/python-base/commits/master/watch/watch.py This patch includes commits beginning with d56fdbc, up to and including 10ae476 Testing: - Built and testing on local distributed cloud system - Similar testing to this patch but ased on locally modified package has been done on 1000 subcloud system - Examine/compare contents of installed package vs. expected - Generating events which trigger the watch conditions - Monitor watches for proper behaviour on expiry Story: 2008960 Task: 43053 Signed-off-by: Kyle MacLeod <kyle.macleod@windriver.com> Change-Id: I7ad78957b6ef61e7204c45f482f201d5c281385b
29 lines
911 B
Diff
29 lines
911 B
Diff
From f11587d0e3cedf645ba12fe4dfd7971ee7162c9d Mon Sep 17 00:00:00 2001
|
|
From: Alexey Volkov <alexey.volkov@ark-kun.com>
|
|
Date: Thu, 17 Oct 2019 17:40:20 -0700
|
|
Subject: [PATCH 06/13] Fixed Watch.unmarshal_event when data is not a
|
|
JSON-serialized object
|
|
|
|
Fixes https://github.com/kubernetes-client/python/issues/982
|
|
Fixes https://github.com/kubernetes-client/python/issues/983
|
|
---
|
|
watch/watch.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/watch/watch.py b/watch/watch.py
|
|
index 77b9794..ba87de9 100644
|
|
--- a/watch/watch.py
|
|
+++ b/watch/watch.py
|
|
@@ -88,6 +88,8 @@ class Watch(object):
|
|
js = json.loads(data)
|
|
except ValueError:
|
|
return data
|
|
+ if not (isinstance(js, dict) and 'object' in js):
|
|
+ return data
|
|
js['raw_object'] = js['object']
|
|
if return_type:
|
|
obj = SimpleNamespace(data=json.dumps(js['raw_object']))
|
|
--
|
|
2.25.1
|
|
|