Skip to content

Commit

Permalink
Merge pull request #989 from gesiscss/testing
Browse files Browse the repository at this point in the history
fix cleaning pods up after testing
  • Loading branch information
betatim authored Oct 29, 2019
2 parents 29e7546 + b3c9128 commit 76b9d19
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions binderhub/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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==9.0.*
escapism
tornado
traitlets
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/images/binderhub/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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==9.0.*
escapism
tornado
traitlets
Expand Down

0 comments on commit 76b9d19

Please sign in to comment.