From a88d65261ace2b1ab135bead4a0968d61fb9e2d4 Mon Sep 17 00:00:00 2001 From: Denis Patrakeev Date: Tue, 4 Mar 2025 20:07:08 +0300 Subject: [PATCH] [hotfix] change to ArgoCD Vault Plugin (!96) Co-authored-by: denis.patrakeev Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/96 --- .../prometheus/argocd-apps-prometheus-secret.yaml | 9 +++------ .../monitoring/prometheus/values-override.yaml | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/argocd-apps-prometheus-secret.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/argocd-apps-prometheus-secret.yaml index 376d9b8..7b393dd 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/argocd-apps-prometheus-secret.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/argocd-apps-prometheus-secret.yaml @@ -7,10 +7,7 @@ metadata: name: prometheus-secret namespace: cloud-prod annotations: - vault.security.banzaicloud.io/vault-addr: "https://vault.avroid.tech" - vault.security.banzaicloud.io/vault-role: "cloud-prod" - vault.security.banzaicloud.io/vault-skip-verify: "false" - vault.security.banzaicloud.io/vault-path: "avroid-office" + avp.kubernetes.io/path: "team-devops/data/services/monitoring/k8s/cloud-prod/prometheus" type: Opaque -data: - consul.secret: dmF1bHQ6dGVhbS1kZXZvcHMvZGF0YS9zZXJ2aWNlcy9tb25pdG9yaW5nL2s4cy9jbG91ZC1wcm9kL3Byb21ldGhldXMjY29uc3VsLnNlY3JldA== +stringData: + consul.secret: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml index fb72ed9..cb0c94a 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml @@ -209,7 +209,7 @@ serverFiles: tags: [ k8s_redis_exporter ] services: [ monitoring_k8s_redis_exporter ] authorization: - credentials: ${CONSUL_SECRET} + credentials: /etc/secrets/consul-secret/consul.secret relabel_configs: - source_labels: [ __meta_consul_service_metadata_metrics_path ] target_label: __metrics_path__ @@ -231,7 +231,7 @@ serverFiles: tags: [ k8s_patroni_exporter ] services: [ monitoring_k8s_patroni_exporter ] authorization: - credentials: ${CONSUL_SECRET} + credentials: /etc/secrets/consul-secret/consul.secret relabel_configs: - source_labels: [ __meta_consul_service_metadata_metrics_path ] target_label: __metrics_path__