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
27 lines
749 B
Diff
27 lines
749 B
Diff
From 972a76a83d0133b45db03495b0f9fd05ed2b94a3 Mon Sep 17 00:00:00 2001
|
|
From: Mitar <mitar.git@tnode.com>
|
|
Date: Wed, 20 Feb 2019 23:56:38 -0800
|
|
Subject: [PATCH 04/13] Don't use break inside finally.
|
|
|
|
It swallows exceptions.
|
|
---
|
|
watch/watch.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/watch/watch.py b/watch/watch.py
|
|
index 79b2358..5966eac 100644
|
|
--- a/watch/watch.py
|
|
+++ b/watch/watch.py
|
|
@@ -151,7 +151,7 @@ class Watch(object):
|
|
if self.resource_version is not None:
|
|
kwargs['resource_version'] = self.resource_version
|
|
else:
|
|
- break
|
|
+ self._stop = True
|
|
|
|
if timeouts or self._stop:
|
|
break
|
|
--
|
|
2.25.1
|
|
|