monitoring: fix grafana user dedupe job

This commit is contained in:
Brad Stein 2026-01-21 12:25:53 -03:00
parent 4e65f02fba
commit ae1fd5b661

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: grafana-user-dedupe-api-v4 name: grafana-user-dedupe-api-v5
namespace: monitoring namespace: monitoring
spec: spec:
backoffLimit: 1 backoffLimit: 1
@ -10,7 +10,6 @@ spec:
metadata: metadata:
annotations: annotations:
vault.hashicorp.com/agent-inject: "true" vault.hashicorp.com/agent-inject: "true"
vault.hashicorp.com/agent-pre-populate: "true"
vault.hashicorp.com/agent-pre-populate-only: "true" vault.hashicorp.com/agent-pre-populate-only: "true"
vault.hashicorp.com/role: "monitoring" vault.hashicorp.com/role: "monitoring"
vault.hashicorp.com/agent-inject-secret-grafana-env.sh: "kv/data/atlas/monitoring/grafana-admin" vault.hashicorp.com/agent-inject-secret-grafana-env.sh: "kv/data/atlas/monitoring/grafana-admin"
@ -32,6 +31,16 @@ spec:
args: args:
- | - |
set -euo pipefail set -euo pipefail
for _ in $(seq 1 30); do
if [ -f /vault/secrets/grafana-env.sh ]; then
break
fi
sleep 1
done
if [ ! -f /vault/secrets/grafana-env.sh ]; then
echo "Vault secret not available"
exit 1
fi
. /vault/secrets/grafana-env.sh . /vault/secrets/grafana-env.sh
grafana_url="${GRAFANA_URL}" grafana_url="${GRAFANA_URL}"
if [ -z "${grafana_url}" ]; then if [ -z "${grafana_url}" ]; then