From 969098c48da80dd858627fc6234856f9fe272aef Mon Sep 17 00:00:00 2001 From: Eman Elsabban Date: Tue, 21 May 2024 09:03:07 -0700 Subject: [PATCH] Deleting mesos_options from tron_tools --- paasta_tools/tron_tools.py | 9 --------- tests/test_tron_tools.py | 21 --------------------- 2 files changed, 30 deletions(-) diff --git a/paasta_tools/tron_tools.py b/paasta_tools/tron_tools.py index 68fd2f4a71..ebf17f10eb 100644 --- a/paasta_tools/tron_tools.py +++ b/paasta_tools/tron_tools.py @@ -847,15 +847,6 @@ def format_volumes(paasta_volume_list): def format_master_config(master_config, default_volumes, dockercfg_location): - mesos_options = master_config.get("mesos_options", {}) - mesos_options.update( - { - "default_volumes": format_volumes(default_volumes), - "dockercfg_location": dockercfg_location, - } - ) - master_config["mesos_options"] = mesos_options - k8s_options = master_config.get("k8s_options", {}) if k8s_options: # Only add default volumes if we already have k8s_options diff --git a/tests/test_tron_tools.py b/tests/test_tron_tools.py index 490c30d0aa..144844ed9b 100644 --- a/tests/test_tron_tools.py +++ b/tests/test_tron_tools.py @@ -737,16 +737,6 @@ def test_format_master_config(self): master_config = { "some_key": 101, "another": "hello", - "mesos_options": { - "default_volumes": [ - { - "container_path": "/nail/tmp", - "host_path": "/nail/tmp", - "mode": "RW", - } - ], - "other_mesos": True, - }, } paasta_volumes = [ {"containerPath": "/nail/other", "hostPath": "/other/home", "mode": "RW"} @@ -758,17 +748,6 @@ def test_format_master_config(self): assert result == { "some_key": 101, "another": "hello", - "mesos_options": { - "default_volumes": [ - { - "container_path": "/nail/other", - "host_path": "/other/home", - "mode": "RW", - } - ], - "dockercfg_location": dockercfg, - "other_mesos": True, - }, } master_config["k8s_options"] = {