Skip to content

Commit

Permalink
Use black for formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
almahmoud committed Sep 27, 2023
1 parent 0c8bef4 commit 05ddf7c
Showing 1 changed file with 41 additions and 35 deletions.
76 changes: 41 additions & 35 deletions lib/galaxy/jobs/runners/kubernetes.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,41 +423,49 @@ def __get_k8s_service_spec(self, ajs):
def __get_k8s_ingress_rules_spec(self, ajs, entry_points):
"""This represents the template for the "rules" portion of the Ingress spec."""
if "v1beta1" in self.runner_params.get("k8s_ingress_api_version"):
rules_spec = [{
"host": ep["domain"],
"http": {
"paths": [{
"backend": {
"serviceName": self.__get_k8s_job_name(
self.__produce_k8s_job_prefix(), ajs.job_wrapper
),
"servicePort": int(ep["tool_port"]),
},
"path": ep.get("entry_path", "/"),
"pathType": "Prefix",
}]
},
} for ep in entry_points]
rules_spec = [
{
"host": ep["domain"],
"http": {
"paths": [
{
"backend": {
"serviceName": self.__get_k8s_job_name(
self.__produce_k8s_job_prefix(), ajs.job_wrapper
),
"servicePort": int(ep["tool_port"]),
},
"path": ep.get("entry_path", "/"),
"pathType": "Prefix",
}
]
},
}
for ep in entry_points
]
else:
rules_spec = [{
"host": ep["domain"],
"http": {
"paths": [{
"backend": {
"service": {
"name": self.__get_k8s_job_name(
self.__produce_k8s_job_prefix(), ajs.job_wrapper
),
"port": {
"number": int(ep["tool_port"])
rules_spec = [
{
"host": ep["domain"],
"http": {
"paths": [
{
"backend": {
"service": {
"name": self.__get_k8s_job_name(
self.__produce_k8s_job_prefix(), ajs.job_wrapper
),
"port": {"number": int(ep["tool_port"])},
}
},
"path": ep.get("entry_path", "/"),
"pathType": "ImplementationSpecific",
}
},
"path": ep.get("entry_path", "/"),
"pathType": "ImplementationSpecific",
}]
},
} for ep in entry_points]
]
},
}
for ep in entry_points
]
return rules_spec

def __get_k8s_ingress_spec(self, ajs):
Expand Down Expand Up @@ -497,9 +505,7 @@ def __get_k8s_ingress_spec(self, ajs):
},
"annotations": {"app.galaxyproject.org/tool_id": ajs.job_wrapper.tool.id},
},
"spec": {
"rules": self.__get_k8s_ingress_rules_spec(ajs, entry_points)
},
"spec": {"rules": self.__get_k8s_ingress_rules_spec(ajs, entry_points)},
}
if self.runner_params.get("k8s_interactivetools_use_ssl"):
domains = list({e["domain"] for e in entry_points})
Expand Down

0 comments on commit 05ddf7c

Please sign in to comment.