Skip to content

chore: don't create unneeded networks #289

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

Draft
davidlougheed wants to merge 1 commit into
base: releases/v18
Choose a base branch
from
Draft

chore: don't create unneeded networks #289

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
50 changes: 38 additions & 12 deletions py_bentoctl/other_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,26 +273,39 @@ def init_docker(client: docker.DockerClient):
# Init Docker network(s)

# network environment variable, kwargs
networks = (
networks: tuple[tuple[str, dict] | tuple[str, dict, c.BentoOptionalFeature], ...] = (
# Aggregation
("BENTO_AGGREGATION_NETWORK", dict(driver="bridge")),
("BENTO_AUTH_NETWORK", dict(driver="bridge")),
("BENTO_AUTH_DB_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_AUTH_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_AUTH),
(
"BENTO_AUTH_DB_NETWORK",
dict(driver="bridge", internal=True), # Does not need to access the web
c.BENTO_FEATURE_AUTH,
),
("BENTO_AUTHZ_NETWORK", dict(driver="bridge")),
("BENTO_AUTHZ_DB_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_BEACON_NETWORK", dict(driver="bridge")),
("BENTO_CBIOPORTAL_NETWORK", dict(driver="bridge")),
("BENTO_CBIOPORTAL_DATABASE_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_CBIOPORTAL_SESSION_NETWORK", dict(driver="bridge")),
("BENTO_BEACON_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_BEACON),
("BENTO_CBIOPORTAL_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_CBIOPORTAL),
(
"BENTO_CBIOPORTAL_DATABASE_NETWORK",
dict(driver="bridge", internal=True), # Does not need to access the web
c.BENTO_FEATURE_CBIOPORTAL,
),
("BENTO_CBIOPORTAL_SESSION_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_CBIOPORTAL),
("BENTO_DROP_BOX_NETWORK", dict(driver="bridge")),
("BENTO_DRS_NETWORK", dict(driver="bridge")),
("BENTO_EVENT_RELAY_NETWORK", dict(driver="bridge")),
("BENTO_GOHAN_API_NETWORK", dict(driver="bridge")),
("BENTO_GOHAN_ES_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_GOHAN_API_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_GOHAN),
(
"BENTO_GOHAN_ES_NETWORK",
dict(driver="bridge", internal=True), # Does not need to access the web
c.BENTO_FEATURE_GOHAN,
),
("BENTO_KATSU_NETWORK", dict(driver="bridge")),
("BENTO_KATSU_DB_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_MONITORING_NETWORK", dict(driver="bridge")),
("BENTO_MONITORING_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_MONITORING),
("BENTO_NOTIFICATION_NETWORK", dict(driver="bridge")),
("BENTO_PUBLIC_NETWORK", dict(driver="bridge")),
("BENTO_PUBLIC_NETWORK", dict(driver="bridge"), c.BENTO_FEATURE_PUBLIC),
("BENTO_REDIS_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
("BENTO_REFERENCE_NETWORK", dict(driver="bridge")),
("BENTO_REFERENCE_DB_NETWORK", dict(driver="bridge", internal=True)), # Does not need to access the web
Expand All @@ -301,13 +314,26 @@ def init_docker(client: docker.DockerClient):
("BENTO_WES_NETWORK", dict(driver="bridge")),
)

for net_var, net_kwargs in networks:
for network in networks:
if len(network) == 2:
net_var, net_kwargs = network
net_enabled = True
else: # len(network) == 3:
net_var, net_kwargs = network[:2]
# noinspection PyTypeChecker
net_feat: c.BentoOptionalFeature = network[2]
net_enabled = net_feat.enabled

task_print(f"Creating Docker network (var: {net_var}) if needed...")

net_name = os.getenv(net_var)
if not net_name:
cprint(f"failed ({net_var} not set).", "red")

if not net_enabled:
task_print_done("feature disabled.", color="yellow")
continue

try:
client.networks.get(net_name)
task_print_done(f"exists already (name: {net_name}).", color="blue")
Expand Down