Skip to content

Commit

Permalink
Merge pull request #2943 from Yelp/f/sergs/PAASTA-17050
Browse files Browse the repository at this point in the history
Fix formatting
  • Loading branch information
sergsyelp committed Oct 21, 2020
2 parents ac4a60c + beef5ef commit 4b4e560
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion paasta_tools/contrib/get_running_task_allocation.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def get_kubernetes_task_allocation_info(namespace: str) -> Iterable[TaskAllocati
"resources": get_kubernetes_resource_request(container.resources),
"container_type": get_container_type(container.name, instance),
"pod_name": pod_name,
"pod_ip": pod_ip
"pod_ip": pod_ip,
}
container_statuses = pod.status.container_statuses or []
for container in container_statuses:
Expand Down
12 changes: 6 additions & 6 deletions tests/test_kubernetes_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
from kubernetes.client.rest import ApiException

from paasta_tools import kubernetes_tools
from paasta_tools.contrib.get_running_task_allocation import (
get_kubernetes_metadata as task_allocation_get_kubernetes_metadata,
)
from paasta_tools.kubernetes_tools import create_custom_resource
from paasta_tools.kubernetes_tools import create_deployment
from paasta_tools.kubernetes_tools import create_kubernetes_secret_signature
Expand Down Expand Up @@ -115,7 +118,6 @@
from paasta_tools.utils import SecretVolume
from paasta_tools.utils import SecretVolumeItem
from paasta_tools.utils import SystemPaastaConfig
from paasta_tools.contrib.get_running_task_allocation import get_kubernetes_metadata as task_allocation_get_kubernetes_metadata


def test_force_delete_pods():
Expand Down Expand Up @@ -3184,16 +3186,14 @@ def test_mode_to_int():

def test_running_task_allocation_get_kubernetes_metadata():
mock_pod = mock.MagicMock()
mock_pod.metadata.labels={
mock_pod.metadata.labels = {
"yelp.com/paasta_service": "srv1",
"yelp.com/paasta_instance": "instance1",
"paasta.yelp.com/service": "srv1",
"paasta.yelp.com/instance": "instance1",
}
mock_pod.spec.node_selector={
'yelp.com/pool': 'default'
}
mock_pod.spec.node_selector = {"yelp.com/pool": "default"}
mock_pod.metadata.name = "pod_1"
mock_pod.status.pod_ip = "10.10.10.10"
ret = task_allocation_get_kubernetes_metadata(mock_pod)
assert ret == ('srv1', 'instance1', 'default', 'pod_1', '10.10.10.10')
assert ret == ("srv1", "instance1", "default", "pod_1", "10.10.10.10")

0 comments on commit 4b4e560

Please sign in to comment.