Skip to content

Commit f3b3362

Browse files
committed
de-dupe deploy code
1 parent 2131397 commit f3b3362

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/warnet/deploy.py

+3-7
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ def deploy(directory, debug, namespace, to_all_users, unknown_args):
6363
if unknown_args:
6464
raise click.BadParameter(f"Unknown args: {unknown_args}{HINT}")
6565

66-
if to_all_users:
67-
namespaces = get_namespaces_by_type(WARGAMES_NAMESPACE_PREFIX)
68-
for namespace in namespaces:
69-
_deploy(directory, debug, namespace.metadata.name, False)
70-
else:
71-
_deploy(directory, debug, namespace, to_all_users)
66+
_deploy(directory, debug, namespace, to_all_users)
7267

7368

7469
def _deploy(directory, debug, namespace, to_all_users):
@@ -78,7 +73,7 @@ def _deploy(directory, debug, namespace, to_all_users):
7873
if to_all_users:
7974
namespaces = get_namespaces_by_type(WARGAMES_NAMESPACE_PREFIX)
8075
for namespace in namespaces:
81-
deploy(directory, debug, namespace.metadata.name, False)
76+
_deploy(directory, debug, namespace.metadata.name, False)
8277
return
8378

8479
if (directory / NETWORK_FILE).exists():
@@ -88,6 +83,7 @@ def _deploy(directory, debug, namespace, to_all_users):
8883
if dl | df:
8984
deploy_ingress(debug)
9085
deploy_caddy(directory, debug)
86+
run_plugins(directory)
9187
elif (directory / NAMESPACES_FILE).exists():
9288
deploy_namespaces(directory)
9389
else:

0 commit comments

Comments
 (0)