From 94fc30729634cff7a7211551049e1e2125f1e8d4 Mon Sep 17 00:00:00 2001
From: Kenan Erdogan <kenan.erdogan@gesis.org>
Date: Fri, 25 Oct 2019 16:21:37 +0200
Subject: [PATCH 1/3] fix cleaning pods up

---
 binderhub/tests/conftest.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/binderhub/tests/conftest.py b/binderhub/tests/conftest.py
index 712bcaf05..adfd47a17 100644
--- a/binderhub/tests/conftest.py
+++ b/binderhub/tests/conftest.py
@@ -222,9 +222,9 @@ def get_pods():
         print(f"deleting pod {pod.metadata.name}")
         try:
             kube.delete_namespaced_pod(
-                pod.metadata.name,
-                namespace,
-                kubernetes.client.V1DeleteOptions(grace_period_seconds=0),
+                name=pod.metadata.name,
+                namespace=namespace,
+                body=kubernetes.client.V1DeleteOptions(grace_period_seconds=0),
             )
         except kubernetes.client.rest.ApiException as e:
             # ignore 404, 409: already gone

From 177af4da8ab36a3df0635f58767ef2b054bae737 Mon Sep 17 00:00:00 2001
From: Kenan Erdogan <kenan.erdogan@gesis.org>
Date: Fri, 25 Oct 2019 16:22:29 +0200
Subject: [PATCH 2/3] install python kubernetes 7.0 as in docker image

---
 doc/doc-requirements.txt | 2 +-
 requirements.txt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/doc-requirements.txt b/doc/doc-requirements.txt
index 96b78c0a8..7837ae739 100644
--- a/doc/doc-requirements.txt
+++ b/doc/doc-requirements.txt
@@ -9,7 +9,7 @@ ruamel.yaml
 # install BinderHub dependencies. We manually list them here because some
 # dependencies (like pycurl) can't be installed on ReadTheDocs and aren't
 # needed to build the docs.
-kubernetes>=4.*
+kubernetes==7.0.*
 escapism
 tornado
 traitlets
diff --git a/requirements.txt b/requirements.txt
index f34cb78aa..42639fcc0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # When you change this file please also update `doc/doc-requirements.txt`
 # which needs to be kept in sync manually.
-kubernetes>=4.*
+kubernetes==7.0.*
 escapism
 tornado
 traitlets

From b3c91287d403e2f09108f5d024162a902b88c63d Mon Sep 17 00:00:00 2001
From: Kenan Erdogan <kenan.erdogan@gesis.org>
Date: Tue, 29 Oct 2019 09:24:50 +0100
Subject: [PATCH 3/3] use python-kubernetes 9.0.*

---
 doc/doc-requirements.txt                     | 2 +-
 helm-chart/images/binderhub/requirements.txt | 2 +-
 requirements.txt                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/doc-requirements.txt b/doc/doc-requirements.txt
index 7837ae739..b6dd15c9a 100644
--- a/doc/doc-requirements.txt
+++ b/doc/doc-requirements.txt
@@ -9,7 +9,7 @@ ruamel.yaml
 # install BinderHub dependencies. We manually list them here because some
 # dependencies (like pycurl) can't be installed on ReadTheDocs and aren't
 # needed to build the docs.
-kubernetes==7.0.*
+kubernetes==9.0.*
 escapism
 tornado
 traitlets
diff --git a/helm-chart/images/binderhub/requirements.txt b/helm-chart/images/binderhub/requirements.txt
index 3d2200259..6145452b2 100644
--- a/helm-chart/images/binderhub/requirements.txt
+++ b/helm-chart/images/binderhub/requirements.txt
@@ -1,6 +1,6 @@
 pycurl==7.43.0.1
 tornado==5.0.*
-kubernetes==7.0.*
+kubernetes==9.0.*
 jupyterhub==1.0.0
 jsonschema==2.6.0
 # Logging sinks to send eventlogging events to
diff --git a/requirements.txt b/requirements.txt
index 42639fcc0..4c00c5bf4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # When you change this file please also update `doc/doc-requirements.txt`
 # which needs to be kept in sync manually.
-kubernetes==7.0.*
+kubernetes==9.0.*
 escapism
 tornado
 traitlets