Merge pull request #144 from nolar/pykube-timeouts

Disable socket timeouts for internal request, especially for watching

kopf/clients/auth.py

@@ -134,5 +134,5 @@ def get_pykube_cfg() -> pykube.KubeConfig:
 
 # TODO: add some caching, but keep kwargs in mind. Maybe add a key= for purpose/use-place?
 def get_pykube_api(timeout=None) -> pykube.HTTPClient:
-    kwargs = dict(timeout=timeout) if timeout is not None else dict()
+    kwargs = dict(timeout=timeout)
     return pykube.HTTPClient(get_pykube_cfg(), **kwargs)

kopf/clients/fetching.py

@@ -74,9 +74,14 @@ def watch_objs(*, resource, namespace=None, timeout=None, since=None):
 
     * The resource is namespace-scoped AND operator is namespaced-restricted.
     """
-    api = auth.get_pykube_api(timeout=timeout)
+
+    params = {}
+    if timeout is not None:
+        params['timeoutSeconds'] = timeout
+
+    api = auth.get_pykube_api(timeout=None)
     cls = classes._make_cls(resource=resource)
     namespace = namespace if issubclass(cls, pykube.objects.NamespacedAPIObject) else None
     lst = cls.objects(api, namespace=pykube.all if namespace is None else namespace)
-    src = lst.watch(since=since)
+    src = lst.watch(since=since, params=params)
     return iter({'type': event.type, 'object': event.object.obj} for event in src)

setup.py

@@ -43,6 +43,6 @@
         'click',
         'iso8601',
         'aiojobs',
-        'pykube-ng>=0.25',
+        'pykube-ng>=0.27',
     ],
 )