From 66a74f3889bb5cedbae8264392bed85923ee7640 Mon Sep 17 00:00:00 2001
From: "circleci-app[bot]"
 <127350680+circleci-app[bot]@users.noreply.github.com>
Date: Mon, 31 Aug 2026 23:52:10 +0000
Subject: [PATCH] Add retry logic to deploy_to_doks_from_chartmuseum for hook
 failures

When a post-upgrade helm hook job fails with BackoffLimitExceeded, the
failed job lingers in the namespace. The --atomic flag causes helm to
roll back, leaving the hook job behind. On the next CI run, clean_jobs
removes it before the upgrade, but the hook can fail again transiently.

This change converts deploy_to_doks_from_chartmuseum from a
prerequisite-chain target to a recipe that cleans up and retries the
helm install once if the first attempt fails, covering transient hook
failures (e.g. delete-rabbitmq-queues running before RabbitMQ is ready).

AI-Generated: true
---
 .do/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.do/Makefile b/.do/Makefile
index 641630bd..ac90f231 100644
--- a/.do/Makefile
+++ b/.do/Makefile
@@ -92,7 +92,9 @@ clean_jobs:
 	-kubectl delete jobs -l app.kubernetes.io/instance=${RELEASE_NAME} --namespace ${NAMESPACE} --ignore-not-found=true
 
 .PHONY: deploy_to_doks_from_chartmuseum
-deploy_to_doks_from_chartmuseum: set_cluster_context setup_helm_repos clean_jobs helm_install_from_chart_museum
+deploy_to_doks_from_chartmuseum: set_cluster_context setup_helm_repos
+	-$(MAKE) clean_jobs
+	$(MAKE) helm_install_from_chart_museum || ($(MAKE) clean_jobs && $(MAKE) helm_install_from_chart_museum)
 
 .PHONY: set_cluster_context
 set_cluster_context: