From 73fb7d0332b26f13a1f4194a563e692607e14d37 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Mon, 20 May 2024 23:09:05 +0000 Subject: [PATCH] Apply black, isort, and autoflake formatting --- kubejobs/examples/example_pod.py | 4 +++- kubejobs/pods.py | 41 +++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/kubejobs/examples/example_pod.py b/kubejobs/examples/example_pod.py index e54363b..031cd1b 100644 --- a/kubejobs/examples/example_pod.py +++ b/kubejobs/examples/example_pod.py @@ -26,7 +26,9 @@ gpu_limit=1, cpu_request=1, ram_request="1Gi", - volume_mounts={"nfs": {"mountPath": "/nfs", "server": "10.24.1.255", "path": "/"}}, + volume_mounts={ + "nfs": {"mountPath": "/nfs", "server": "10.24.1.255", "path": "/"} + }, ) pod_yaml = pod.generate_yaml() diff --git a/kubejobs/pods.py b/kubejobs/pods.py index 39a6640..ea6997a 100644 --- a/kubejobs/pods.py +++ b/kubejobs/pods.py @@ -1,9 +1,10 @@ +import logging import os -import yaml import subprocess from typing import List, Optional + +import yaml from kubernetes import config -import logging from kubejobs.jobs import fetch_user_info @@ -119,7 +120,9 @@ def __init__( def _add_shm_size(self, container: dict): """Adds shared memory volume if shm_size is set.""" if self.shm_size: - container["volumeMounts"].append({"name": "dshm", "mountPath": "/dev/shm"}) + container["volumeMounts"].append( + {"name": "dshm", "mountPath": "/dev/shm"} + ) return container def _add_env_vars(self, container: dict): @@ -195,9 +198,13 @@ def generate_yaml(self): container["args"] = self.args if not ( - self.gpu_type is None or self.gpu_limit is None or self.gpu_product is None + self.gpu_type is None + or self.gpu_limit is None + or self.gpu_product is None ): - container["resources"] = {"limits": {f"{self.gpu_type}": self.gpu_limit}} + container["resources"] = { + "limits": {f"{self.gpu_type}": self.gpu_limit} + } container = self._add_shm_size(container) container = self._add_env_vars(container) @@ -224,10 +231,14 @@ def generate_yaml(self): container["resources"]["limits"]["memory"] = self.ram_request if self.storage_request is not None: - container["resources"]["requests"]["storage"] = self.storage_request + container["resources"]["requests"][ + "storage" + ] = self.storage_request if self.gpu_type is not None and self.gpu_limit is not None: - container["resources"]["limits"][f"{self.gpu_type}"] = self.gpu_limit + container["resources"]["limits"][ + f"{self.gpu_type}" + ] = self.gpu_limit pod = { "apiVersion": "v1", @@ -248,9 +259,13 @@ def generate_yaml(self): pod["metadata"]["namespace"] = self.namespace if not ( - self.gpu_type is None or self.gpu_limit is None or self.gpu_product is None + self.gpu_type is None + or self.gpu_limit is None + or self.gpu_product is None ): - pod["spec"]["nodeSelector"] = {f"{self.gpu_type}.product": self.gpu_product} + pod["spec"]["nodeSelector"] = { + f"{self.gpu_type}.product": self.gpu_product + } # Add shared memory volume if shm_size is set if self.shm_size: @@ -270,7 +285,9 @@ def generate_yaml(self): volume = {"name": mount_name} if "pvc" in mount_data: - volume["persistentVolumeClaim"] = {"claimName": mount_data["pvc"]} + volume["persistentVolumeClaim"] = { + "claimName": mount_data["pvc"] + } elif "emptyDir" in mount_data: volume["emptyDir"] = {} # Add more volume types here if needed @@ -283,7 +300,9 @@ def generate_yaml(self): pod["spec"]["volumes"].append(volume) if self.image_pull_secret: - pod["spec"]["imagePullSecrets"] = [{"name": self.image_pull_secret}] + pod["spec"]["imagePullSecrets"] = [ + {"name": self.image_pull_secret} + ] return yaml.dump(pod)