Skip to content

Admin panels: rolling config update #1012

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

Merged
merged 5 commits into from
Apr 14, 2025
Merged

Admin panels: rolling config update #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12d5ff2
Admin panels: rolling config update
YuryHrytsuk Apr 4, 2025
9e015d0
Use ~ to concatenate strings in jinja
YuryHrytsuk Apr 4, 2025
5137ee7
Admin panels: fix docker-compose.yml generation
YuryHrytsuk Apr 4, 2025
aab5e31
Admin panels: polish makefile dependencies
YuryHrytsuk Apr 4, 2025
10a7bba
Merge branch 'main' into admin-panels-rolling-config-update
YuryHrytsuk Apr 14, 2025
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
19 changes: 9 additions & 10 deletions services/admin-panels/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,42 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile

# Helpers --------------------------------------------------
define custom-jinja
@${REPO_BASE_DIR}/.venv/bin/j2 --format=json $(1) $(2) -o $(3)
@${REPO_BASE_DIR}/.venv/bin/j2 --format=json $(1) $(2) -o $(3) \
--filters $(REPO_BASE_DIR)/scripts/j2cli_global_filters.py
endef

.PHONY: .data.json
.data.json:
@$(_tree) -J ${PWD}/data | jq ".[0]" > .data.json


.PHONY: docker-compose.yml
docker-compose.yml: docker-compose.yml.j2 .venv .data.json
docker-compose.yml: docker-compose.yml.j2 .venv .data.json .env jupyter_server_config.py
$(call custom-jinja, $<, .data.json, tmp.yml)
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash tmp.yml > $@
@rm tmp.yml

.PHONY: up
up: .init .env jupyter_server_config.py ${TEMP_COMPOSE} ## Deploys jaeger stack
up: .init ${TEMP_COMPOSE} prune-docker-stack-configs ## Deploys jaeger stack
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}

.PHONY: up-letsencrypt-http
up-letsencrypt-http: .init .env jupyter_server_config.py ${TEMP_COMPOSE}-letsencrypt-http ## Deploys jaeger stack using let's encrypt http challenge
up-letsencrypt-http: .init ${TEMP_COMPOSE}-letsencrypt-http prune-docker-stack-configs ## Deploys jaeger stack using let's encrypt http challenge
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-http ${STACK_NAME}

.PHONY: up-letsencrypt-dns
up-letsencrypt-dns: .init .env jupyter_server_config.py ${TEMP_COMPOSE}-letsencrypt-dns ## Deploys jaeger stack using let's encrypt dns challenge
up-letsencrypt-dns: .init ${TEMP_COMPOSE}-letsencrypt-dns prune-docker-stack-configs ## Deploys jaeger stack using let's encrypt dns challenge
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-dns ${STACK_NAME}

.PHONY: up-dalco ## Deploys jaeger stack for Dalco Cluster
up-dalco: .init .env jupyter_server_config.py ${TEMP_COMPOSE}-dalco
up-dalco: .init ${TEMP_COMPOSE}-dalco prune-docker-stack-configs
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}

.PHONY: up-aws
up-aws: .init .env jupyter_server_config.py ${TEMP_COMPOSE}-aws ## Deploys jaeger stack in aws
up-aws: .init ${TEMP_COMPOSE}-aws prune-docker-stack-configs ## Deploys jaeger stack in aws
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-aws ${STACK_NAME}

.PHONY: up-master
up-master: .init .env jupyter_server_config.py ${TEMP_COMPOSE}-master
up-master: .init ${TEMP_COMPOSE}-master prune-docker-stack-configs
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-master ${STACK_NAME}

.PHONY: up-local
Expand Down Expand Up @@ -85,7 +85,6 @@ ${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
${TEMP_COMPOSE}: docker-compose.yml .env
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@


.PHONY: jupyter_server_config.py
jupyter_server_config.py: jupyter_server_config.py.template
@set -o allexport; \
Expand Down
2 changes: 2 additions & 0 deletions services/admin-panels/docker-compose.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
version: "3.7"
configs:
adminpanel-jupyter-server-config:
name: ${STACK_NAME}_adminpanel-jupyter-server-config_{{ "./jupyter_server_config.py" | sha256file | substring(0,10) }}
file: ./jupyter_server_config.py
{% for item in contents %}
{{ item.name }}:
name: {% raw %}${STACK_NAME}{% endraw %}_{{item.name}}_{{ ("./data/" ~ item.name) | sha256file | substring(0,10) }}
file: ./data/{{ item.name }}{% endfor %}
services:
adminpanels:
Expand Down
2 changes: 2 additions & 0 deletions services/admin-panels/template.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# This contains all relevant secrets so that the admin panels may use them to access the services
STACK_NAME=${STACK_NAME}

MONITORING_DOMAIN=${MONITORING_DOMAIN}
ADMINPANELS_DOMAIN=${ADMINPANELS_DOMAIN}
DEPLOYMENT_FQDNS=${DEPLOYMENT_FQDNS}
Expand Down
Loading