Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19.05] Filter all pykube queries by namespace #8092

Merged
merged 1 commit into from Jun 10, 2019
Merged

[19.05] Filter all pykube queries by namespace #8092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/galaxy/jobs/runners/kubernetes.py
View file
Open in desktop
Expand Up @@ -468,7 +468,8 @@ def __job_failed_due_to_low_memory(self, job_state):
marks the job for resubmission (resubmit logic is part of destinations).
"""

pods = Pod.objects(self._pykube_api).filter(selector="app=%s" % job_state.job_id)
pods = Pod.objects(self._pykube_api).filter(selector="app=%s" % job_state.job_id,
namespace=self.runner_params['k8s_namespace'])
pod = Pod(self._pykube_api, pods.response['items'][0])

if pod.obj['status']['phase'] == "Failed" and \
Expand All @@ -481,8 +482,9 @@ def stop_job(self, job_wrapper):
"""Attempts to delete a dispatched job to the k8s cluster"""
job = job_wrapper.get_job()
try:
jobs = Job.objects(self._pykube_api).filter(selector="app=" +
self.__produce_unique_k8s_job_name(job.get_id_tag()))
jobs = Job.objects(self._pykube_api).filter(
selector="app=" + self.__produce_unique_k8s_job_name(job.get_id_tag()),
namespace=self.runner_params['k8s_namespace'])
if len(jobs.response['items']) >= 0:
job_to_delete = Job(self._pykube_api, jobs.response['items'][0])
job_to_delete.scale(replicas=0)
Expand Down