From 6177b581e47cdb8b3a747ccec4836a268b524803 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Wed, 4 Mar 2026 08:48:30 +0000 Subject: [PATCH] fix: correct dashboard verification checks and retry helm upgrade lock --- .gitea/workflows/dashboards.yml | 3 ++- ansible/roles/observability/tasks/main.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/dashboards.yml b/.gitea/workflows/dashboards.yml index a7f3c28..5c23ea7 100644 --- a/.gitea/workflows/dashboards.yml +++ b/.gitea/workflows/dashboards.yml @@ -93,6 +93,7 @@ jobs: - name: Verify Grafana content resources working-directory: ansible run: | - ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl -n observability get configmap | grep grafana" + ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl -n observability get configmap -l grafana_datasource=1" + ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl -n observability get configmap -l grafana_dashboard=1" env: ANSIBLE_HOST_KEY_CHECKING: "False" diff --git a/ansible/roles/observability/tasks/main.yml b/ansible/roles/observability/tasks/main.yml index 260a628..b280e88 100644 --- a/ansible/roles/observability/tasks/main.yml +++ b/ansible/roles/observability/tasks/main.yml @@ -50,6 +50,10 @@ --values /tmp/kube-prometheus-stack-values.yaml --wait --timeout 10m + register: kube_prom_install + retries: 6 + delay: 20 + until: kube_prom_install.rc == 0 changed_when: true - name: Wait for Grafana deployment rollout