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

Deleting mesos_options from tron_tools #3879

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Deleting mesos_options from tron_tools #3879

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions paasta_tools/tron_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions tests/test_tron_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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"] = {
Expand Down
Loading