From 9e7316499c17113026e82276b94baa12f22cfc43 Mon Sep 17 00:00:00 2001 From: cc-ci Date: Tue, 11 Aug 2026 18:38:40 +0000 Subject: [PATCH] fix: keep config object versions in abra.sh only, not .env.sample These five were added to .env.sample while abra.sh already exported them, so every deployment got a second, divergent copy. That is not just untidy. .env.sample becomes the operator .env at `abra app new`, and a .env is NEVER updated by a recipe upgrade. So the next time a recipe change bumps e.g. CLICKHOUSE_ENTRYPOINT_VERSION in abra.sh, an existing deployment keeps the stale value from its .env: the config CONTENT changes while the swarm config NAME does not, and swarm configs are immutable - FATA failed to update config _clickhouse_entrypoint_v6: only updates to Labels are allowed which is exactly the failure gitea hit with app_ini_v22. The fleet convention, consistent across gitea/discourse/keycloak/mailu: .env.sample carries SECRET_*_VERSION only (operator-managed secret rotation); config object versions live in abra.sh (recipe-managed - bumping one IS a recipe change). plausible main already followed this; only this branch diverged. abra.sh is unchanged and keeps CLICKHOUSE_USER_CONF_VERSION=v3 - that bump is correct, clickhouse-user-config.xml content genuinely changed. --- .env.sample | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.env.sample b/.env.sample index 5961cf8..e49b3fa 100644 --- a/.env.sample +++ b/.env.sample @@ -18,9 +18,3 @@ SMTP_HOST_PORT=25 #SMTP_USER_PWD= SMTP_HOST_SSL_ENABLED=false -## Config object versions (increment when config file content changes) -CLICKHOUSE_CONF_VERSION=v2 -CLICKHOUSE_USER_CONF_VERSION=v3 -CLICKHOUSE_ENTRYPOINT_VERSION=v6 -PG_BACKUP_VERSION=v1 -CLICKHOUSE_BACKUP_SCRIPT_VERSION=v1