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
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From b68ca3055178e31a5d87a0a98780e4987a4d23ae Mon Sep 17 00:00:00 2001
|
|
From: Nabarun Pal <pal.nabarun95@gmail.com>
|
|
Date: Thu, 16 Jul 2020 14:08:44 +0530
|
|
Subject: [PATCH 10/13] Fixes codestyle failures
|
|
|
|
Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
|
|
---
|
|
watch/watch.py | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/watch/watch.py b/watch/watch.py
|
|
index 6410dfa..3058ed9 100644
|
|
--- a/watch/watch.py
|
|
+++ b/watch/watch.py
|
|
@@ -171,9 +171,10 @@ class Watch(object):
|
|
retry_after_410 = True
|
|
break
|
|
else:
|
|
- reason = "%s: %s" % (obj['reason'], obj['message'])
|
|
- raise client.rest.ApiException(status=obj['code'],
|
|
- reason=reason)
|
|
+ reason = "%s: %s" % (
|
|
+ obj['reason'], obj['message'])
|
|
+ raise client.rest.ApiException(
|
|
+ status=obj['code'], reason=reason)
|
|
else:
|
|
retry_after_410 = False
|
|
yield event
|
|
--
|
|
2.25.1
|
|
|