From fbf92789f26b589c06600823ad06ebb69849a906 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 17 Mar 2025 09:38:55 -0700 Subject: [PATCH] Make nodepool image export forward/backward compatible As we rollout Noble nodes we have to maintain compatiblity between focal with docker-compose and noble with docker compose. One difference is the default container names change between them. We can work around that by using docker compose commands to refer to the logical container rather than the specific container. Update the nodepool builder image export cron job to use docker-compose exec instead of docker exec for this reason. Change-Id: Iba2e395cf1792096c629ab74f849d55e96d74329 --- playbooks/roles/nodepool-builder/tasks/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/nodepool-builder/tasks/main.yaml b/playbooks/roles/nodepool-builder/tasks/main.yaml index ce8ce6edd6..226f790dd8 100644 --- a/playbooks/roles/nodepool-builder/tasks/main.yaml +++ b/playbooks/roles/nodepool-builder/tasks/main.yaml @@ -49,4 +49,4 @@ hour: '{{ 23 | random(seed=inventory_hostname) }}' # Note we backup to /var/log/nodepool because that is what we have bind # mounted in the container and we are operating relative to that context - job: docker exec nodepool-builder-compose_nodepool-builder_1 nodepool export-image-data /var/log/nodepool/nodepool-image-backup.json + job: docker-compose -f /etc/nodepool-builder-compose/docker-compose.yaml exec nodepool-builder nodepool export-image-data /var/log/nodepool/nodepool-image-backup.json